From 86e29bea04a43699b78c052cae33ed6c51a0059a Mon Sep 17 00:00:00 2001 From: Will Hinds Date: Wed, 15 Mar 2023 07:50:34 -0400 Subject: [PATCH] change: clarify remapped methods (#453) --- .../mods/lithium/common/entity/EntityClassGroup.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/jellysquid/mods/lithium/common/entity/EntityClassGroup.java b/src/main/java/me/jellysquid/mods/lithium/common/entity/EntityClassGroup.java index ebc32c5cd..68402bd22 100644 --- a/src/main/java/me/jellysquid/mods/lithium/common/entity/EntityClassGroup.java +++ b/src/main/java/me/jellysquid/mods/lithium/common/entity/EntityClassGroup.java @@ -24,9 +24,9 @@ public class EntityClassGroup { public static final EntityClassGroup MINECART_BOAT_LIKE_COLLISION; //aka entities that will attempt to collide with all other entities when moving static { - String remapped_method_30949 = FabricLoader.getInstance().getMappingResolver().mapMethodName("intermediary", "net.minecraft.class_1297", "method_30949", "(Lnet/minecraft/class_1297;)Z"); + String remapped_collidesWith = FabricLoader.getInstance().getMappingResolver().mapMethodName("intermediary", "net.minecraft.class_1297", "method_30949", "(Lnet/minecraft/class_1297;)Z"); MINECART_BOAT_LIKE_COLLISION = new EntityClassGroup( - (Class entityClass) -> ReflectionUtil.hasMethodOverride(entityClass, Entity.class, true, remapped_method_30949, Entity.class)); + (Class entityClass) -> ReflectionUtil.hasMethodOverride(entityClass, Entity.class, true, remapped_collidesWith, Entity.class)); //sanity check: in case intermediary mappings changed, we fail if ((!MINECART_BOAT_LIKE_COLLISION.contains(MinecartEntity.class))) { @@ -86,9 +86,9 @@ public static class NoDragonClassGroup extends EntityClassGroup { public static final NoDragonClassGroup BOAT_SHULKER_LIKE_COLLISION; //aka entities that other entities will do block-like collisions with when moving static { - String remapped_method_30948 = FabricLoader.getInstance().getMappingResolver().mapMethodName("intermediary", "net.minecraft.class_1297", "method_30948", "()Z"); + String remapped_isCollidable = FabricLoader.getInstance().getMappingResolver().mapMethodName("intermediary", "net.minecraft.class_1297", "method_30948", "()Z"); BOAT_SHULKER_LIKE_COLLISION = new NoDragonClassGroup( - (Class entityClass) -> ReflectionUtil.hasMethodOverride(entityClass, Entity.class, true, remapped_method_30948)); + (Class entityClass) -> ReflectionUtil.hasMethodOverride(entityClass, Entity.class, true, remapped_isCollidable)); if ((!BOAT_SHULKER_LIKE_COLLISION.contains(ShulkerEntity.class))) { throw new AssertionError();