Cache block data strings
This commit is contained in:
@@ -156,7 +156,7 @@ public class CraftBlockData implements BlockData {
|
||||
return exactMatch;
|
||||
}
|
||||
|
||||
private static final Map<Class<? extends Enum<?>>, Enum<?>[]> ENUM_VALUES = new HashMap<>();
|
||||
private static final Map<Class<? extends Enum<?>>, Enum<?>[]> ENUM_VALUES = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - cache block data strings; make thread safe
|
||||
|
||||
/**
|
||||
* Convert an NMS Enum (usually a BlockStateEnum) to its appropriate Bukkit
|
||||
@@ -548,7 +548,38 @@ public class CraftBlockData implements BlockData {
|
||||
Preconditions.checkState(CraftBlockData.MAP.put(nms, bukkit) == null, "Duplicate mapping %s->%s", nms, bukkit);
|
||||
}
|
||||
|
||||
// Paper start - cache block data strings
|
||||
private static Map<String, CraftBlockData> stringDataCache = new java.util.concurrent.ConcurrentHashMap<>();
|
||||
|
||||
static {
|
||||
// cache all of the default states at startup, will not cache ones with the custom states inside of the
|
||||
// brackets in a different order, though
|
||||
reloadCache();
|
||||
}
|
||||
|
||||
public static void reloadCache() {
|
||||
stringDataCache.clear();
|
||||
Block.BLOCK_STATE_REGISTRY.forEach(blockData -> stringDataCache.put(blockData.toString(), blockData.createCraftBlockData()));
|
||||
}
|
||||
// Paper end - cache block data strings
|
||||
|
||||
public static CraftBlockData newData(BlockType blockType, String data) {
|
||||
|
||||
// Paper start - cache block data strings
|
||||
if (blockType != null) {
|
||||
Block block = CraftBlockType.bukkitToMinecraftNew(blockType);
|
||||
if (block != null) {
|
||||
net.minecraft.resources.ResourceLocation key = BuiltInRegistries.BLOCK.getKey(block);
|
||||
data = data == null ? key.toString() : key + data;
|
||||
}
|
||||
}
|
||||
|
||||
CraftBlockData cached = stringDataCache.computeIfAbsent(data, s -> createNewData(null, s));
|
||||
return (CraftBlockData) cached.clone();
|
||||
}
|
||||
|
||||
private static CraftBlockData createNewData(BlockType blockType, String data) {
|
||||
// Paper end - cache block data strings
|
||||
net.minecraft.world.level.block.state.BlockState blockData;
|
||||
Block block = blockType == null ? null : ((CraftBlockType<?>) blockType).getHandle();
|
||||
Map<Property<?>, Comparable<?>> parsed = null;
|
||||
|
||||
Reference in New Issue
Block a user