Add copper golem statue, shelf collision boxes and other missing 1.21.10 stuff (#2315)

* add copper golem statue

* Include ViaVersion substitution

* add shelves

* also add copper armor

* add mannequin box sizes

* Add copper golem size

Author: AnnotationVisitor

common/src/main/java/ac/grim/grimac/utils/inventory/EquipmentType.java

@@ -33,23 +33,26 @@ public static EquipmentType getEquipmentSlotForItem(ItemStack itemStack) {
         }
         if (item == ItemTypes.LEATHER_BOOTS || item == ItemTypes.CHAINMAIL_BOOTS
                 || item == ItemTypes.IRON_BOOTS || item == ItemTypes.DIAMOND_BOOTS
-                || item == ItemTypes.GOLDEN_BOOTS || item == ItemTypes.NETHERITE_BOOTS) {
+                || item == ItemTypes.GOLDEN_BOOTS || item == ItemTypes.NETHERITE_BOOTS
+                || item == ItemTypes.COPPER_BOOTS) {
             return FEET;
         }
         if (item == ItemTypes.LEATHER_LEGGINGS || item == ItemTypes.CHAINMAIL_LEGGINGS
                 || item == ItemTypes.IRON_LEGGINGS || item == ItemTypes.DIAMOND_LEGGINGS
-                || item == ItemTypes.GOLDEN_LEGGINGS || item == ItemTypes.NETHERITE_LEGGINGS) {
+                || item == ItemTypes.GOLDEN_LEGGINGS || item == ItemTypes.NETHERITE_LEGGINGS
+                || item == ItemTypes.COPPER_LEGGINGS) {
             return LEGS;
         }
         if (item == ItemTypes.LEATHER_CHESTPLATE || item == ItemTypes.CHAINMAIL_CHESTPLATE
                 || item == ItemTypes.IRON_CHESTPLATE || item == ItemTypes.DIAMOND_CHESTPLATE
-                || item == ItemTypes.GOLDEN_CHESTPLATE || item == ItemTypes.NETHERITE_CHESTPLATE) {
+                || item == ItemTypes.GOLDEN_CHESTPLATE || item == ItemTypes.NETHERITE_CHESTPLATE
+                || item == ItemTypes.COPPER_CHESTPLATE) {
             return CHEST;
         }
         if (item == ItemTypes.LEATHER_HELMET || item == ItemTypes.CHAINMAIL_HELMET
                 || item == ItemTypes.IRON_HELMET || item == ItemTypes.DIAMOND_HELMET
                 || item == ItemTypes.GOLDEN_HELMET || item == ItemTypes.NETHERITE_HELMET
-                || item == ItemTypes.TURTLE_HELMET) {
+                || item == ItemTypes.COPPER_HELMET || item == ItemTypes.TURTLE_HELMET) {
             return HEAD;
         }
         return ItemTypes.SHIELD == item ? OFFHAND : MAINHAND;

common/src/main/java/ac/grim/grimac/utils/nmsutil/BoundingBoxSize.java

@@ -31,7 +31,7 @@ private static float getWidthMinusBaby(GrimPlayer player, PacketEntity packetEnt
             return 0.75f;
         } else if (EntityTypes.PANDA.equals(type)) {
             return 1.3f;
-        } else if (EntityTypes.BAT.equals(type) || EntityTypes.PARROT.equals(type) || EntityTypes.COD.equals(type) || EntityTypes.EVOKER_FANGS.equals(type) || EntityTypes.TROPICAL_FISH.equals(type) || EntityTypes.FROG.equals(type)) {
+        } else if (EntityTypes.BAT.equals(type) || EntityTypes.PARROT.equals(type) || EntityTypes.COD.equals(type) || EntityTypes.EVOKER_FANGS.equals(type) || EntityTypes.TROPICAL_FISH.equals(type) || EntityTypes.FROG.equals(type) || EntityTypes.COPPER_GOLEM.equals(type)) {
             return 0.5f;
         } else if (EntityTypes.ARMADILLO.equals(type) || EntityTypes.BEE.equals(type) || EntityTypes.PUFFERFISH.equals(type) || EntityTypes.SALMON.equals(type) || EntityTypes.SNOW_GOLEM.equals(type) || EntityTypes.CAVE_SPIDER.equals(type)) {
             return 0.7f;
@@ -87,7 +87,7 @@ private static float getWidthMinusBaby(GrimPlayer player, PacketEntity packetEnt
             return 0.98f;
         } else if (EntityTypes.isTypeInstanceOf(type, EntityTypes.MINECART_ABSTRACT)) {
             return 0.98f;
-        } else if (EntityTypes.PLAYER.equals(type)) {
+        } else if (EntityTypes.PLAYER.equals(type) || EntityTypes.MANNEQUIN.equals(type)) {
             return 0.6f;
         } else if (EntityTypes.POLAR_BEAR.equals(type)) {
             return 1.4f;
@@ -199,7 +199,7 @@ public static double getMyRidingOffset(PacketEntity packetEntity) {
             return 0.1;
         } else if (EntityTypes.EVOKER.equals(type) || EntityTypes.ILLUSIONER.equals(type) || EntityTypes.PILLAGER.equals(type) || EntityTypes.RAVAGER.equals(type) || EntityTypes.VINDICATOR.equals(type) || EntityTypes.WITCH.equals(type)) {
             return -0.45;
-        } else if (EntityTypes.PLAYER.equals(type)) {
+        } else if (EntityTypes.PLAYER.equals(type) || EntityTypes.MANNEQUIN.equals(type)) {
             return -0.35;
         }
 
@@ -337,7 +337,7 @@ private static float getHeightMinusBaby(GrimPlayer player, PacketEntity packetEn
             }
 
             return 1.8f;
-        } else if (EntityTypes.PLAYER.equals(type)) {
+        } else if (EntityTypes.PLAYER.equals(type) || EntityTypes.MANNEQUIN.equals(type)) {
             return 1.8f;
         } else if (EntityTypes.POLAR_BEAR.equals(type)) {
             return 1.4f;
@@ -405,6 +405,8 @@ private static float getHeightMinusBaby(GrimPlayer player, PacketEntity packetEn
             return 1.8F;
         } else if (EntityTypes.FIREWORK_ROCKET.equals(type)) {
             return 0.25F;
+        } else if (EntityTypes.COPPER_GOLEM.equals(type)) {
+            return 1.0F;
         }
         return 1.95f;
     }