From c926cddbd646b865c1524720c1462ad55d392dc0 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Thu, 19 Sep 2019 14:56:03 -0400 Subject: [PATCH] Item Registry Test is now functional --- .../com/sk89q/worldedit/bukkit/WorldEditPlugin.java | 1 + .../sk89q/worldedit/bukkit/ItemRegistryTest.java | 7 +++---- .../com/sk89q/worldedit/world/block/BlockTypes.java | 13 +++++++------ .../com/sk89q/worldedit/world/item/ItemTypes.java | 8 ++++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java index 20a289528..0a50892f4 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java @@ -354,6 +354,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter private void loadConfig() { createDefaultConfiguration("config-legacy.yml"); // Create the default configuration file + config = new BukkitConfiguration(new YAMLProcessor(new File(getDataFolder(), "config-legacy.yml"), true), this); config.load(); // Create schematics folder diff --git a/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/ItemRegistryTest.java b/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/ItemRegistryTest.java index 6ce44288b..d8e6a8f91 100644 --- a/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/ItemRegistryTest.java +++ b/worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/ItemRegistryTest.java @@ -20,21 +20,20 @@ package com.sk89q.worldedit.bukkit; import com.sk89q.worldedit.world.item.ItemType; -import com.sk89q.worldedit.world.item.ItemTypes; import org.bukkit.Material; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; public class ItemRegistryTest { @Test - public void testTreeTypeMapping() { + public void testItemRegistry() { for (Material material : Material.values()) { if (material.isItem() && !material.isLegacy()) { ItemType.REGISTRY.register(material.getKey().toString(), new ItemType(material.getKey().toString())); - System.out.println(material.getKey().toString()); } } - System.out.println(ItemType.REGISTRY.getKnownNamespaces().toString()); + Assertions.assertNotNull(ItemType.REGISTRY.get("minecraft:wooden_axe")); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java index 54892c15c..6ab3de9b4 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java @@ -923,7 +923,6 @@ public final class BlockTypes { { // Register new blocks int internalId = 1; for (Map.Entry entry : blockMap.entrySet()) { - String id = entry.getKey(); String defaultState = entry.getValue(); // Skip already registered ids for (; values[internalId] != null; internalId++); @@ -994,7 +993,7 @@ public final class BlockTypes { throw new SuggestInputParseException("Does not match a valid block type: " + inputLower, inputLower, () -> Stream.of(BlockTypes.values) .filter(b -> StringMan.blockStateMatches(inputLower, b.getId())) - .map(e1 -> e1.getId()) + .map(BlockType::getId) .sorted(StringMan.blockStateComparator(inputLower)) .collect(Collectors.toList()) ); @@ -1004,12 +1003,14 @@ public final class BlockTypes { return $NAMESPACES; } - public static @Nullable BlockType get(final String id) { - return BlockType.REGISTRY.getMap().get(id); + @Nullable + public static BlockType get(final String id) { + return BlockType.REGISTRY.get(id); } - public static @Nullable BlockType get(final CharSequence id) { - return BlockType.REGISTRY.getMap().get(id); + @Nullable + public static BlockType get(final CharSequence id) { + return BlockType.REGISTRY.get(id.toString()); } @Deprecated diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java index 857c42a41..5b5f84d5a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java @@ -232,7 +232,7 @@ public final class ItemTypes { @Nullable public static final ItemType CYAN_WOOL = get("minecraft:cyan_wool"); @Nullable public static final ItemType DAMAGED_ANVIL = get("minecraft:damaged_anvil"); @Nullable public static final ItemType DANDELION = get("minecraft:dandelion"); - @Deprecated @Nullable public static final ItemType DANDELION_YELLOW = Optional.ofNullable(get("minecraft:dandelion_yellow")).orElseGet(() -> get("minecraft:yellow_dye")); + @Deprecated @Nullable public static final ItemType DANDELION_YELLOW = Optional.ofNullable(get("minecraft:dandelion_yellow")).orElseGet(() -> (get("minecraft:yellow_dye"))); @Nullable public static final ItemType DARK_OAK_BOAT = get("minecraft:dark_oak_boat"); @Nullable public static final ItemType DARK_OAK_BUTTON = get("minecraft:dark_oak_button"); @Nullable public static final ItemType DARK_OAK_DOOR = get("minecraft:dark_oak_door"); @@ -730,7 +730,7 @@ public final class ItemTypes { @Nullable public static final ItemType REPEATER = get("minecraft:repeater"); @Nullable public static final ItemType REPEATING_COMMAND_BLOCK = get("minecraft:repeating_command_block"); @Nullable public static final ItemType ROSE_BUSH = get("minecraft:rose_bush"); - @Deprecated @Nullable public static final ItemType ROSE_RED = Optional.ofNullable(get("minecraft:rose_red")).orElseGet(() -> get("minecraft:red_dye")); + @Deprecated @Nullable public static final ItemType ROSE_RED = Optional.ofNullable(get("minecraft:rose_red")).orElseGet(() -> (get("minecraft:red_dye"))); @Nullable public static final ItemType ROTTEN_FLESH = get("minecraft:rotten_flesh"); @Nullable public static final ItemType SADDLE = get("minecraft:saddle"); @Nullable public static final ItemType SALMON = get("minecraft:salmon"); @@ -752,7 +752,7 @@ public final class ItemTypes { @Nullable public static final ItemType SHULKER_BOX = get("minecraft:shulker_box"); @Nullable public static final ItemType SHULKER_SHELL = get("minecraft:shulker_shell"); @Nullable public static final ItemType SHULKER_SPAWN_EGG = get("minecraft:shulker_spawn_egg"); - @Deprecated @Nullable public static final ItemType SIGN = Optional.ofNullable(get("minecraft:sign")).orElseGet(() -> get("minecraft:oak_sign")); + @Deprecated @Nullable public static final ItemType SIGN = Optional.ofNullable(get("minecraft:sign")).orElseGet(() -> (get("minecraft:oak_sign"))); @Nullable public static final ItemType SILVERFISH_SPAWN_EGG = get("minecraft:silverfish_spawn_egg"); @Nullable public static final ItemType SKELETON_HORSE_SPAWN_EGG = get("minecraft:skeleton_horse_spawn_egg"); @Nullable public static final ItemType SKELETON_SKULL = get("minecraft:skeleton_skull"); @@ -929,7 +929,7 @@ public final class ItemTypes { return get(input); } - public static @Nullable ItemType get(String id) { + public static @Nullable ItemType get(final String id) { return ItemType.REGISTRY.get(id); }