From 11f1a5380c676dc92692f952ae84303f1fcefae6 Mon Sep 17 00:00:00 2001 From: themode Date: Mon, 16 Nov 2020 00:46:46 +0100 Subject: [PATCH] Fix data file not being generated in TestLootTables --- .../minestom/server/registry/ResourceGatherer.java | 14 ++------------ src/test/java/loottables/TestLootTables.java | 9 +++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/minestom/server/registry/ResourceGatherer.java b/src/main/java/net/minestom/server/registry/ResourceGatherer.java index 500c29b82..9a0aa1fd9 100644 --- a/src/main/java/net/minestom/server/registry/ResourceGatherer.java +++ b/src/main/java/net/minestom/server/registry/ResourceGatherer.java @@ -9,19 +9,9 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.io.*; import java.net.URL; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.StandardCopyOption; +import java.nio.file.*; import java.nio.file.attribute.BasicFileAttributes; /** diff --git a/src/test/java/loottables/TestLootTables.java b/src/test/java/loottables/TestLootTables.java index d84a8f714..45bc350e9 100644 --- a/src/test/java/loottables/TestLootTables.java +++ b/src/test/java/loottables/TestLootTables.java @@ -1,5 +1,6 @@ package loottables; +import net.minestom.server.MinecraftServer; import net.minestom.server.data.Data; import net.minestom.server.data.DataImpl; import net.minestom.server.gamedata.conditions.SurvivesExplosionCondition; @@ -10,12 +11,14 @@ import net.minestom.server.gamedata.loottables.entries.ItemType; import net.minestom.server.gamedata.loottables.tabletypes.BlockType; import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; +import net.minestom.server.registry.ResourceGatherer; import net.minestom.server.utils.NamespaceID; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.FileNotFoundException; +import java.io.IOException; import java.io.StringReader; import java.util.List; @@ -25,6 +28,12 @@ public class TestLootTables { @BeforeEach public void init() { + try { + ResourceGatherer.ensureResourcesArePresent(MinecraftServer.VERSION_NAME); + } catch (IOException e) { + e.printStackTrace(); + } + tableManager = new LootTableManager(); tableManager.registerConditionDeserializer(NamespaceID.from("minecraft:survives_explosion"), new SurvivesExplosionCondition.Deserializer()); tableManager.registerTableType(NamespaceID.from("minecraft:block"), new BlockType());