mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixed #3368

Browse Source
This commit is contained in:
TheBusyBiscuit 2022-01-01 00:57:13 +01:00
parent 8114729e16
commit 96aaa9de43
4 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -39,6 +39,8 @@
#### Fixes
* Fixed #3390
* Fixed research issues for vanilla items, e.g. Trident or Totem of Undying
* Fixed #3368
## Release Candidate 30 (31 Dec 2021)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#30

26
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
View File

@ -2,7 +2,6 @@ package io.github.thebusybiscuit.slimefun4.implementation.setup;
import javax.annotation.ParametersAreNonnullByDefault;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
@ -101,7 +100,7 @@ public final class ResearchSetup {
register("knight_talisman", 71, "Talisman of the Knight", 20, SlimefunItems.TALISMAN_KNIGHT);
register("gilded_iron", 72, "Shiny Iron", 11, SlimefunItems.GILDED_IRON);
register("synthetic_emerald", 73, "Fake Gem", 17, SlimefunItems.SYNTHETIC_EMERALD);
register("chainmail_armor", 74, "Chainmail Armor", 8, new ItemStack(Material.CHAINMAIL_HELMET), new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_LEGGINGS), new ItemStack(Material.CHAINMAIL_BOOTS));
register("chainmail_armor", 74, "Chainmail Armor", 8, "CHAIN_HELMET", "CHAIN_CHESTPLATE", "CHAIN_LEGGINGS", "CHAIN_BOOTS");
register("whirlwind_talisman", 75, "Talisman of the Whirlwind", 19, SlimefunItems.TALISMAN_WHIRLWIND);
register("wizard_talisman", 76, "Talisman of the Wizard", 22, SlimefunItems.TALISMAN_WIZARD);
register("lumber_axe", 77, "Lumber Axe", 21, SlimefunItems.LUMBER_AXE);
@ -131,7 +130,7 @@ public final class ResearchSetup {
register("crucible", 107, "Crucible", 13, SlimefunItems.CRUCIBLE);
register("gilded_backpack", 108, "Gilded Backpack", 22, SlimefunItems.GILDED_BACKPACK);
register("armored_jetpack", 111, "Armored Jetpack", 27, SlimefunItems.ARMORED_JETPACK);
register("ender_talismans", 112, "Ender Talismans", 28);
register("ender_talismans", 112, "Ender Talismans", 28, new String[0]);
register("nickel_and_cobalt", 115, "Even more Ores", 10, SlimefunItems.NICKEL_INGOT, SlimefunItems.COBALT_INGOT);
register("magnet", 116, "Magnetic Metals", 16, SlimefunItems.MAGNET);
register("infused_magnet", 117, "Infused Magnets", 18, SlimefunItems.INFUSED_MAGNET);
@ -236,7 +235,7 @@ public final class ResearchSetup {
register("high_tier_carbon_press", 225, "Ultimate Carbon Press", 32, SlimefunItems.CARBON_PRESS_3);
register("wither_assembler", 226, "Automated Wither Killer", 35, SlimefunItems.WITHER_ASSEMBLER);
register("better_heated_pressure_chamber", 227, "Upgraded Heated Pressure Chamber", 20, SlimefunItems.HEATED_PRESSURE_CHAMBER_2);
register("elytra", 228, "Elytras", 20, SlimefunItems.ELYTRA_SCALE, new ItemStack(Material.ELYTRA));
register("elytra", 228, "Elytras", 20, "ELYTRA_SCALE", "ELYTRA");
register("special_elytras", 229, "Special Elytras", 30, SlimefunItems.INFUSED_ELYTRA, SlimefunItems.SOULBOUND_ELYTRA);
register("electric_crucible", 230, "Electrified Crucible", 26, SlimefunItems.ELECTRIFIED_CRUCIBLE);
register("better_electric_crucibles", 231, "Hot Crucibles", 30, SlimefunItems.ELECTRIFIED_CRUCIBLE_2, SlimefunItems.ELECTRIFIED_CRUCIBLE_3);
@ -256,7 +255,7 @@ public final class ResearchSetup {
register("soulbound_rune", 246, "Soulbound Rune", 60, SlimefunItems.SOULBOUND_RUNE);
register("geo_miner", 247, "GEO-Miner", 24, SlimefunItems.GEO_MINER);
register("lightning_rune", 248, "Lightning Rune", 24, SlimefunItems.LIGHTNING_RUNE);
register("totem_of_undying", 249, "Totem of Undying", 36, new ItemStack(Material.TOTEM_OF_UNDYING));
register("totem_of_undying", 249, "Totem of Undying", 36, "TOTEM_OF_UNDYING");
register("charging_bench", 250, "Charging Bench", 8, SlimefunItems.CHARGING_BENCH);
register("nether_gold_pan", 251, "Nether Gold Pan", 8, SlimefunItems.NETHER_GOLD_PAN);
register("electric_press", 252, "Electric Press", 16, SlimefunItems.ELECTRIC_PRESS, SlimefunItems.ELECTRIC_PRESS_2);
@ -288,7 +287,7 @@ public final class ResearchSetup {
register("ingredients_and_cheese", 276, "Slimefun Cuisine", 5, SlimefunItems.SALT, SlimefunItems.WHEAT_FLOUR, SlimefunItems.HEAVY_CREAM, SlimefunItems.CHEESE, SlimefunItems.BUTTER);
register("medium_tier_auto_enchanting", 277, "Fast Automatic Enchanting and Disenchanting", 48, SlimefunItems.AUTO_ENCHANTER_2, SlimefunItems.AUTO_DISENCHANTER_2);
register("portable_teleporter", 278, "Teleportation from Anywhere", 42, SlimefunItems.PORTABLE_TELEPORTER);
register("trident", 279, "Trident", 20, new ItemStack(Material.TRIDENT));
register("trident", 279, "Trident", 20, "TRIDENT");
register("farmer_talisman", 280, "Talisman of the Farmer", 18, SlimefunItems.TALISMAN_FARMER);
}
@ -306,4 +305,19 @@ public final class ResearchSetup {
research.register();
}
@ParametersAreNonnullByDefault
private static void register(String key, int id, String name, int defaultCost, String... items) {
Research research = new Research(new NamespacedKey(Slimefun.instance(), key), id, name, defaultCost);
for (String itemId : items) {
SlimefunItem sfItem = SlimefunItem.getById(itemId);
if (sfItem != null) {
research.addItems(sfItem);
}
}
research.register();
}
}

67
src/test/java/io/github/thebusybiscuit/slimefun4/core/researching/TestResearchSetup.java
View File

@ -1,67 +0,0 @@
package io.github.thebusybiscuit.slimefun4.core.researching;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import io.github.thebusybiscuit.slimefun4.api.researches.Research;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import io.github.thebusybiscuit.slimefun4.implementation.setup.ResearchSetup;
import be.seeseemelk.mockbukkit.MockBukkit;
@TestMethodOrder(value = OrderAnnotation.class)
class TestResearchSetup {
@BeforeAll
public static void load() {
MockBukkit.mock();
MockBukkit.load(Slimefun.class);
}
@AfterAll
public static void unload() {
MockBukkit.unmock();
}
@Test
@DisplayName("Test if ResearchSetup throws an Exception")
@Order(value = 1)
void testForExceptions() {
// Not really ideal but still important to test.
// Research amount is variable, so we can't test for that.
// We are really only concerned about any runtime exceptions here.
Slimefun.getRegistry().setResearchingEnabled(true);
Assertions.assertDoesNotThrow(() -> ResearchSetup.setupResearches());
// Running it a second time should NOT be allowed.
Assertions.assertThrows(UnsupportedOperationException.class, () -> ResearchSetup.setupResearches());
}
@Test
@Order(value = 2)
@DisplayName("Test if Researches have a translation")
void testResearchTranslations() throws IOException {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/languages/en/researches.yml"), StandardCharsets.UTF_8))) {
FileConfiguration config = YamlConfiguration.loadConfiguration(reader);
for (Research research : Slimefun.getRegistry().getResearches()) {
String path = research.getKey().getNamespace() + '.' + research.getKey().getKey();
Assertions.assertTrue(config.contains(path));
}
}
}
}

74
src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestItemSetup.java → src/test/java/io/github/thebusybiscuit/slimefun4/implementation/registration/TestRegistration.java
View File

@ -4,6 +4,9 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.stream.Stream;
import javax.annotation.Nonnull;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
@ -15,18 +18,23 @@ import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
import io.github.thebusybiscuit.slimefun4.api.items.ItemState;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.researches.Research;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import io.github.thebusybiscuit.slimefun4.implementation.setup.PostSetup;
import io.github.thebusybiscuit.slimefun4.implementation.setup.ResearchSetup;
import io.github.thebusybiscuit.slimefun4.implementation.setup.SlimefunItemSetup;
import be.seeseemelk.mockbukkit.MockBukkit;
@TestMethodOrder(value = OrderAnnotation.class)
class TestItemSetup {
class TestRegistration {
private static Slimefun plugin;
@ -44,7 +52,7 @@ class TestItemSetup {
@Test
@Order(value = 1)
@DisplayName("Test whether SlimefunItemSetup.setup() throws any Exceptions")
void testForExceptions() {
void testItemRegistration() {
// Not really ideal but still important to test.
// Item amount is variable, so we can't test for that.
// We are really only concerned about any runtime exceptions here.
@ -54,13 +62,11 @@ class TestItemSetup {
Assertions.assertThrows(UnsupportedOperationException.class, () -> SlimefunItemSetup.setup(plugin));
}
@Test
@Order(value = 2)
@DisplayName("Assert all Items enabled")
void testNoDisabledItems() {
for (SlimefunItem item : Slimefun.getRegistry().getAllSlimefunItems()) {
Assertions.assertNotEquals(ItemState.UNREGISTERED, item.getState(), item.toString() + " was not registered?");
}
@MethodSource("allItems")
@ParameterizedTest(name = "Assert that {0} is enabled")
void testNoDisabledItems(@Nonnull SlimefunItem item) {
Assertions.assertNotEquals(ItemState.UNREGISTERED, item.getState(), item.toString() + " was not registered?");
}
@Test
@ -83,4 +89,56 @@ class TestItemSetup {
}
}
}
@Test
@Order(value = 5)
@DisplayName("Test if ResearchSetup throws an Exception")
void testResearchRegistration() {
// Not really ideal but still important to test.
// Research amount is variable, so we can't test for that.
// We are really only concerned about any runtime exceptions here.
Slimefun.getRegistry().setResearchingEnabled(true);
// It is important that this is run after item registration
Assertions.assertDoesNotThrow(() -> ResearchSetup.setupResearches());
// Running it a second time should NOT be allowed.
Assertions.assertThrows(UnsupportedOperationException.class, () -> ResearchSetup.setupResearches());
}
@Test
@Order(value = 6)
void testPostSetup() {
Assertions.assertDoesNotThrow(() -> PostSetup.loadItems());
}
@Test
@Order(value = 7)
@DisplayName("Test if all researches have a translation")
void testResearchTranslations() throws IOException {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/languages/en/researches.yml"), StandardCharsets.UTF_8))) {
FileConfiguration config = YamlConfiguration.loadConfiguration(reader);
for (Research research : Slimefun.getRegistry().getResearches()) {
String path = research.getKey().getNamespace() + '.' + research.getKey().getKey();
Assertions.assertTrue(config.contains(path));
}
}
}
@Order(value = 8)
@MethodSource("allResearches")
@ParameterizedTest(name = "Test if {0} has items assigned")
void testForEmptyResearches(@Nonnull Research research) throws IOException {
// This test is related to Issue #3368
Assertions.assertFalse(research.getAffectedItems().isEmpty());
}
private static @Nonnull Stream<Arguments> allItems() {
return Slimefun.getRegistry().getAllSlimefunItems().stream().map(Arguments::of);
}
private static @Nonnull Stream<Arguments> allResearches() {
return Slimefun.getRegistry().getResearches().stream().map(Arguments::of);
}
}