From 7c858424b59ccf53a23e08a352af2d75fb8b361c Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Mon, 1 Nov 2021 09:47:57 -0400
Subject: [PATCH] Fix shading issues introduced with cb8781b3

---
 proxy/build.gradle | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/proxy/build.gradle b/proxy/build.gradle
index 0cf1f0691..fd38a2004 100644
--- a/proxy/build.gradle
+++ b/proxy/build.gradle
@@ -107,8 +107,17 @@ shadowJar {
     // Exclude the fastutil IO utilities - we don't use them.
     exclude 'it/unimi/dsi/fastutil/io/**'
 
-    // Exclude most of the int types - Object2IntMap have a values() method that returns an IntCollection
-    exclude 'it/unimi/dsi/fastutil/ints/*Int2*'
+    // Exclude most of the int types - Object2IntMap have a values() method that returns an
+    // IntCollection, and we need Int2ObjectMap
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Boolean*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Byte*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Char*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Double*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Float*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Int*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Long*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Short*'
+    exclude 'it/unimi/dsi/fastutil/ints/*Int2Reference*'
     exclude 'it/unimi/dsi/fastutil/ints/IntAVL*'
     exclude 'it/unimi/dsi/fastutil/ints/IntArray*'
     exclude 'it/unimi/dsi/fastutil/ints/*IntBi*'
@@ -118,7 +127,6 @@ shadowJar {
     exclude 'it/unimi/dsi/fastutil/ints/IntHeap*'
     exclude 'it/unimi/dsi/fastutil/ints/IntOpen*'
     exclude 'it/unimi/dsi/fastutil/ints/IntRB*'
-    exclude 'it/unimi/dsi/fastutil/ints/IntSet*'
     exclude 'it/unimi/dsi/fastutil/ints/IntSorted*'
     exclude 'it/unimi/dsi/fastutil/ints/*Priority*'
     exclude 'it/unimi/dsi/fastutil/ints/*BigList*'