diff --git a/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml b/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml deleted file mode 100755 index 7b5b3b7..0000000 --- a/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/ButtonCore/pom.xml b/ButtonCore/pom.xml index 568f662..2ae7ccb 100755 --- a/ButtonCore/pom.xml +++ b/ButtonCore/pom.xml @@ -31,6 +31,7 @@ 1.8 1.8 + UTF-8 @@ -68,6 +69,7 @@ src/main/resources + UTF-8 @@ -131,13 +133,6 @@ 1.12.2-R0.1-SNAPSHOT provided - - - commons-io - commons-io - 1.3.2 - provided - com.github.TBMCPlugins.ButtonCore diff --git a/ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdater.java b/ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdater.java index 64401fd..5454ea1 100755 --- a/ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdater.java +++ b/ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdater.java @@ -5,16 +5,13 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.apache.commons.io.FileUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; -import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -66,7 +63,7 @@ public class PluginUpdater { private static boolean updatePluginJitPack(CommandSender sender, String correctname, String correctbranch) { - URL url; + /*URL url; File result = new File(updatedir, correctname + ".jar"); try { url = new URL("https://jitpack.io/com/github/TBMCPlugins/" @@ -93,8 +90,9 @@ public class PluginUpdater { error(sender, "IO error while updating " + correctname + "\n" + e.getMessage()); } catch (Exception e) { e.printStackTrace(); - error(sender, "Unknown error while updating " + correctname + ": " + e); - } + error(sender, "Unknown error while updating " + correctname + ": " + e); - TODO: Either add Commons or don't use FileUtils + }*/ + info(sender, "Plugin updating is currently not supported"); return false; } diff --git a/ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java b/ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java index 6b193aa..35a33b7 100755 --- a/ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java @@ -4,7 +4,6 @@ import buttondevteam.core.MainPlugin; import buttondevteam.core.component.updater.PluginUpdater; import buttondevteam.lib.player.ChromaGamerBase; import buttondevteam.lib.potato.DebugPotato; -import org.apache.commons.io.IOUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -15,10 +14,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; +import java.util.*; import java.util.Map.Entry; public class TBMCCoreAPI { @@ -63,7 +59,8 @@ public class TBMCCoreAPI { InputStream in = con.getInputStream(); String encoding = con.getContentEncoding(); encoding = encoding == null ? "UTF-8" : encoding; - String body = IOUtils.toString(in, encoding); + Scanner s = new Scanner(in).useDelimiter("\\A"); + String body = s.hasNext() ? s.next() : ""; in.close(); return body; } diff --git a/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java b/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java index b3d6fbd..2a73e16 100644 --- a/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java @@ -166,7 +166,8 @@ public final class IHaveConfig { } }).filter(Objects::nonNull).collect(Collectors.toList()); } else { - MainPlugin.Instance.getLogger().warning("Method " + m.getName() + " returns a config but its parameters are unknown: " + Arrays.toString(m.getParameterTypes())); + if (TBMCCoreAPI.IsTestServer()) + MainPlugin.Instance.getLogger().warning("Method " + m.getName() + " returns a config but its parameters are unknown: " + Arrays.toString(m.getParameterTypes())); continue; } for (val c : configList) { diff --git a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java index ff1b5f1..e111d77 100644 --- a/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java +++ b/ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java @@ -1,6 +1,7 @@ package buttondevteam.lib.chat; import buttondevteam.core.MainPlugin; +import lombok.experimental.var; import lombok.val; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; diff --git a/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java b/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java index 13433bf..ecfd4ac 100755 --- a/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java +++ b/ButtonCore/src/test/java/buttondevteam/core/PlayerDataTest.java @@ -6,9 +6,14 @@ import buttondevteam.lib.player.TBMCPlayerBase; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.io.FileUtils; import java.io.File; +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; import java.util.UUID; public class PlayerDataTest extends TestCase { @@ -25,7 +30,27 @@ public class PlayerDataTest extends TestCase { public void testConfig() throws Exception { TestPrepare.PrepareServer(); - FileUtils.deleteDirectory(new File(ChromaGamerBase.TBMC_PLAYERS_DIR)); + //FileUtils.deleteDirectory(new File(ChromaGamerBase.TBMC_PLAYERS_DIR)); + Files.walkFileTree(new File(ChromaGamerBase.TBMC_PLAYERS_DIR).toPath(), new SimpleFileVisitor() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) + throws IOException { + Files.delete(file); + return FileVisitResult.CONTINUE; + } + + @Override + public FileVisitResult postVisitDirectory(Path dir, IOException e) + throws IOException { + if (e == null) { + Files.delete(dir); + return FileVisitResult.CONTINUE; + } else { + // directory iteration failed + throw e; + } + } + }); UUID uuid = new UUID(0L, 0L); try (TestPlayerClass p = TBMCPlayerBase.getPlayer(uuid, TestPlayerClass.class)) { p.PlayerName().set("Test");