Getter for original map in IntMap

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java

@@ -30,8 +30,8 @@ import java.util.Map.Entry;
 public class ConnectionData {
     private static final BlockChangeRecord[] A = new BlockChangeRecord[0];
     public static BlockConnectionProvider blockConnectionProvider;
-    static IntObjectMap<String> idToKey = CollectionUtil.createIntObjectMap(8581);
+    static IntObjectMap<String> idToKey = CollectionUtil.createIntObjectMap(8582);
-    static Map<String, Integer> keyToId = new HashMap<>(8581);
+    static Map<String, Integer> keyToId = new HashMap<>(8582);
     static IntObjectMap<ConnectionHandler> connectionHandlerMap = CollectionUtil.createIntObjectMap(1);
     static IntObjectMap<BlockData> blockConnectionData = CollectionUtil.createIntObjectMap(1);
     static IntSet occludingStates = CollectionUtil.createIntSet(377);

common/src/main/java/us/myles/ViaVersion/util/fastutil/IntMap.java

@@ -1,5 +1,7 @@
 package us.myles.ViaVersion.util.fastutil;
 
+import java.util.Map;
+
 /**
  * Very simple wrapping interface to either be implemented by a HashMap or FastUtil's OpenHashMap.
  */
@@ -32,4 +34,13 @@ public interface IntMap {
      * @see java.util.HashMap#remove(Object)
      */
     int remove(int key);
+
+    /**
+     * Returns the underlying map for usage of not implemented methods of this class.
+     *
+     * @return original map
+     * @deprecated will cause wrapping if it is a FastUtil collection
+     */
+    @Deprecated
+    Map<Integer, Integer> getMap();
 }

common/src/main/java/us/myles/ViaVersion/util/fastutil/WrappedFUIntMap.java

@@ -35,4 +35,9 @@ final class WrappedFUIntMap implements IntMap {
     public int remove(int key) {
         return map.remove(key);
     }
+
+    @Override
+    public Map<Integer, Integer> getMap() {
+        return map;
+    }
 }

common/src/main/java/us/myles/ViaVersion/util/fastutil/WrappedIntMap.java

@@ -32,6 +32,12 @@ final class WrappedIntMap implements IntMap {
 
     @Override
     public int remove(int key) {
-        return map.remove(key);
+        Integer removed = map.remove(key);
+        return removed != null ? removed : -1;
+    }
+
+    @Override
+    public Map<Integer, Integer> getMap() {
+        return map;
     }
 }