From f408a5d4c6f11cf9f7dbbba5414e2e0e6c63996e Mon Sep 17 00:00:00 2001 From: KennyTV Date: Tue, 9 Jun 2020 08:38:22 +0200 Subject: [PATCH] Add last load factors --- .../us/myles/ViaVersion/api/protocol/ProtocolRegistry.java | 2 +- .../protocols/protocol1_13to1_12_2/storage/BlockStorage.java | 2 +- .../protocols/protocol1_14to1_13_2/data/MappingData.java | 4 ++-- .../ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java | 2 +- .../ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java index 87ffe49b0..4553bd6d2 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java @@ -137,7 +137,7 @@ public class ProtocolRegistry { protocols.put(protocol.getClass(), protocol); for (int version : supported) { - Int2ObjectMap protocolMap = registryMap.computeIfAbsent(version, s -> new Int2ObjectOpenHashMap<>(1)); + Int2ObjectMap protocolMap = registryMap.computeIfAbsent(version, s -> new Int2ObjectOpenHashMap<>(2)); protocolMap.put(output, protocol); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java index 4f032b8c9..91728d621 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class BlockStorage extends StoredObject { - private static final IntSet WHITELIST = new IntOpenHashSet(46); + private static final IntSet WHITELIST = new IntOpenHashSet(46, 1F); private final Map blocks = new ConcurrentHashMap<>(); static { diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java index 6acf4527e..2bcf0a6e5 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java @@ -40,7 +40,7 @@ public class MappingData { JsonObject heightMapData = MappingDataLoader.loadData("heightMapData-1.14.json"); JsonArray motionBlocking = heightMapData.getAsJsonArray("MOTION_BLOCKING"); - MappingData.motionBlocking = new IntOpenHashSet(motionBlocking.size()); + MappingData.motionBlocking = new IntOpenHashSet(motionBlocking.size(), 1F); for (JsonElement blockState : motionBlocking) { String key = blockState.getAsString(); Integer id = blockStateMap.get(key); @@ -52,7 +52,7 @@ public class MappingData { } if (Via.getConfig().isNonFullBlockLightFix()) { - nonFullBlocks = new IntOpenHashSet(1611); + nonFullBlocks = new IntOpenHashSet(1611, 1F); for (Map.Entry blockstates : mapping1_13_2.getAsJsonObject("blockstates").entrySet()) { final String state = blockstates.getValue().getAsString(); if (state.contains("_slab") || state.contains("_stairs") || state.contains("_wall[")) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java index 2aa6d4ef3..b86e10dc7 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ItemRewriter.java @@ -19,7 +19,7 @@ public class ItemRewriter { private static final Map POTION_NAME_TO_ID = new HashMap<>(); private static final Map POTION_ID_TO_NAME = new HashMap<>(); - private static final Int2IntMap POTION_INDEX = new Int2IntOpenHashMap(36); + private static final Int2IntMap POTION_INDEX = new Int2IntOpenHashMap(36, 1F); static { /* Entities */ diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java index 4884f6c1c..bcb3fe542 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java @@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; public class Effect { - private static final Int2IntMap EFFECTS = new Int2IntOpenHashMap(17); + private static final Int2IntMap EFFECTS = new Int2IntOpenHashMap(17, 1F); static { addRewrite(1005, 1010); //Play music disc