Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 27, 2025
+13 −8
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f4793e
add copper golem statue
AnnotationVisitor Oct 24, 2025
3d9c32c
Include ViaVersion substitution
AnnotationVisitor Oct 24, 2025
f7e3059
add shelves
AnnotationVisitor Oct 24, 2025
9a1c648
also add copper armor
AnnotationVisitor Oct 24, 2025
3f13fa5
add mannequin box sizes
AnnotationVisitor Oct 24, 2025
34725ad
Add copper golem size
AnnotationVisitor Oct 24, 2025
430c453
Merge branch '2.0' into fix-copper-statue
AnnotationVisitor Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions common/src/main/java/ac/grim/grimac/utils/inventory/EquipmentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 6 additions & 4 deletions common/src/main/java/ac/grim/grimac/utils/nmsutil/BoundingBoxSize.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down