From df60e50c96ef0a5b0b122f8cf4bc5b9fa807374a Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:32:51 -0500 Subject: [PATCH] Revert more changes --- .../world/block/BlockTypesCache.java | 32 +++++++++---------- .../world/registry/LegacyMapper.java | 18 +++++------ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java index ca491f111..4fb47affe 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java @@ -10,6 +10,7 @@ import com.sk89q.worldedit.registry.state.PropertyKey; import com.sk89q.worldedit.world.registry.BlockMaterial; import com.sk89q.worldedit.world.registry.BlockRegistry; import com.sk89q.worldedit.world.registry.Registries; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; @@ -21,7 +22,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.function.Function; import java.util.stream.Collectors; public class BlockTypesCache { @@ -127,7 +127,10 @@ public class BlockTypesCache { int[] result = new int[maxStateId]; Arrays.fill(result, -1); int[] state = new int[props.size()]; - int[] sizes = props.stream().mapToInt(prop -> prop.getValues().size()).toArray(); + int[] sizes = new int[props.size()]; + for (int i = 0; i < props.size(); i++) { + sizes[i] = props.get(i).getValues().size(); + } int index = 0; outer: while (true) { @@ -174,11 +177,7 @@ public class BlockTypesCache { Registries registries = platform.getRegistries(); BlockRegistry blockReg = registries.getBlockRegistry(); Collection blocks = blockReg.values(); - Map blockMap = blocks.stream().collect(Collectors.toMap(item -> { - return item.charAt(item.length() - 1) == ']' ? item.substring(0, item.indexOf('[')) - : item; - }, - Function.identity())); + Map blockMap = blocks.stream().collect(Collectors.toMap(item -> item.charAt(item.length() - 1) == ']' ? item.substring(0, item.indexOf('[')) : item, item -> item)); int size = blockMap.size() + 1; Field[] idFields = BlockID.class.getDeclaredFields(); @@ -209,22 +208,21 @@ public class BlockTypesCache { } } - // Register new blocks - int internalId = 1; - for (Map.Entry entry : blockMap.entrySet()) { - String defaultState = entry.getValue(); - // Skip already registered ids - while (values[internalId] != null) { - internalId++; + { // Register new blocks + int internalId = 1; + for (Map.Entry entry : blockMap.entrySet()) { + String defaultState = entry.getValue(); + // Skip already registered ids + for (; values[internalId] != null; internalId++); + BlockType type = register(defaultState, internalId, stateList); + values[internalId] = type; } - BlockType type = register(defaultState, internalId, stateList); - values[internalId] = type; } for (int i = 0; i < values.length; i++) { if (values[i] == null) values[i] = values[0]; } - states = stateList.toArray(new BlockState[0]); + states = stateList.toArray(new BlockState[stateList.size()]); } catch (Throwable e) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java index d7fa15b71..d4c457aea 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java @@ -77,7 +77,6 @@ public final class LegacyMapper { } catch (Throwable e) { log.warn("Failed to load the built-in legacy id registry", e); } - } /** @@ -104,7 +103,7 @@ public final class LegacyMapper { for (Map.Entry blockEntry : dataFile.blocks.entrySet()) { String id = blockEntry.getKey(); - int combinedId = getCombinedId(blockEntry.getKey()); + Integer combinedId = getCombinedId(blockEntry.getKey()); final String value = blockEntry.getValue(); blockEntries.put(id, value); @@ -117,6 +116,7 @@ public final class LegacyMapper { } } catch (InputParseException f) { BlockFactory blockFactory = WorldEdit.getInstance().getBlockFactory(); + // if fixer is available, try using that first, as some old blocks that were renamed share names with new blocks if (fixer != null) { try { @@ -125,6 +125,7 @@ public final class LegacyMapper { } catch (InputParseException e) { } } + // if it's still null, the fixer was unavailable or failed if (state == null) { try { @@ -132,6 +133,7 @@ public final class LegacyMapper { } catch (InputParseException e) { } } + // if it's still null, both fixer and default failed if (state == null) { log.debug("Unknown block: " + value); @@ -143,8 +145,8 @@ public final class LegacyMapper { } if (state != null) { blockArr[combinedId] = state.getInternalId(); - blockStateToLegacyId4Data.put(state.getInternalId(), Integer.valueOf(combinedId)); - blockStateToLegacyId4Data.putIfAbsent(state.getInternalBlockTypeId(), Integer.valueOf(combinedId)); + blockStateToLegacyId4Data.put(state.getInternalId(), (Integer) combinedId); + blockStateToLegacyId4Data.putIfAbsent(state.getInternalBlockTypeId(), combinedId); } } for (int id = 0; id < 256; id++) { @@ -168,8 +170,6 @@ public final class LegacyMapper { if (type == null) { log.debug("Unknown item: " + value); } else { - itemToStringMap.put(type, id); - stringToItemMap.put(id, type); try { itemMap.put(getCombinedId(id), type); } catch (Exception ignored) { @@ -216,10 +216,10 @@ public final class LegacyMapper { @Nullable public int[] getLegacyFromItem(ItemType itemType) { Integer combinedId = getLegacyCombined(itemType); - if (combinedId != null) { - return new int[]{combinedId >> 4, combinedId & 0xF}; - } else { + if (combinedId == null) { return null; + } else { + return new int[]{combinedId >> 4, combinedId & 0xF}; } }