diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/JoinedCharSequence.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/JoinedCharSequence.java index 0c9cdb0e1..b5b250aaf 100644 --- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/JoinedCharSequence.java +++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/JoinedCharSequence.java @@ -1,5 +1,9 @@ package com.fastasyncworldedit.core.util; +/** + * @deprecated Unused, will be removed in the future. Use String concatenation instead. + */ +@Deprecated(forRemoval = true, since = "TODO") public class JoinedCharSequence implements CharSequence { private char join; 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 47e083809..e79a9af5a 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 @@ -20,7 +20,6 @@ package com.sk89q.worldedit.world.block; import com.fastasyncworldedit.core.command.SuggestInputParseException; -import com.fastasyncworldedit.core.util.JoinedCharSequence; import com.fastasyncworldedit.core.util.StringMan; import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; @@ -1923,23 +1922,19 @@ public final class BlockTypes { public static final BlockType ZOMBIE_WALL_HEAD = init(); private static Field[] fieldsTmp; - private static JoinedCharSequence joined; private static int initIndex = 0; public static BlockType init() { if (fieldsTmp == null) { fieldsTmp = BlockTypes.class.getDeclaredFields(); BlockTypesCache.$NAMESPACES.isEmpty(); // initialize cache - joined = new JoinedCharSequence(); } String name = fieldsTmp[initIndex++].getName().toLowerCase(Locale.ROOT); - CharSequence fullName = joined.init(BlockType.REGISTRY.getDefaultNamespace(), ':', name); - return BlockType.REGISTRY.getMap().get(fullName); + return BlockType.REGISTRY.get(name); } static { fieldsTmp = null; - joined = null; } /* 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 41360c3c2..51369161a 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 @@ -19,7 +19,6 @@ package com.sk89q.worldedit.world.item; -import com.fastasyncworldedit.core.util.JoinedCharSequence; import com.fastasyncworldedit.core.world.block.ItemTypesCache; import com.sk89q.worldedit.world.registry.LegacyMapper; @@ -2362,7 +2361,6 @@ public final class ItemTypes { } private static Field[] fieldsTmp; - private static JoinedCharSequence joined; private static int initIndex = 0; private static ItemType init() { @@ -2370,11 +2368,9 @@ public final class ItemTypes { if (fieldsTmp == null) { fieldsTmp = ItemTypes.class.getDeclaredFields(); ItemTypesCache.init(); // force class to load - joined = new JoinedCharSequence(); } String name = fieldsTmp[initIndex++].getName().toLowerCase(Locale.ROOT); - CharSequence fullName = joined.init(ItemType.REGISTRY.getDefaultNamespace(), ':', name); - return ItemType.REGISTRY.getMap().get(fullName); + return ItemType.REGISTRY.get(name); } catch (Throwable e) { e.printStackTrace(); throw e; @@ -2383,7 +2379,6 @@ public final class ItemTypes { static { fieldsTmp = null; - joined = null; } @Nullable