From 944e8bf84ce750b5bce5708d4be407b2c1a16b86 Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Wed, 2 Sep 2020 20:27:47 +0000 Subject: [PATCH] Map missing client collision methods (#1710) * Map missing client collision methods * wouldSuffocateAt -> wouldCollideAt * Remove spurious space Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Fix duplicate method mapping * Unify overloads of isSpaceEmpty * Differenciate block-only emptiness checks Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../client/network/ClientPlayerEntity.mapping | 2 ++ .../minecraft/world/BlockCollisionSpliterator.mapping | 3 +++ mappings/net/minecraft/world/CollisionView.mapping | 10 ++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index e3828da6dd..a5ccbeaa37 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -56,6 +56,8 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity METHOD method_26269 getMoodPercentage ()F COMMENT Returns the percentage for the biome mood sound for the debug HUD to COMMENT display. + METHOD method_30673 pushOutOfBlocks (DD)V + METHOD method_30674 wouldCollideAt (Lnet/minecraft/class_2338;)Z METHOD method_3130 getRecipeBook ()Lnet/minecraft/class_299; METHOD method_3131 hasJumpingMount ()Z METHOD method_3132 openRidingInventory ()V diff --git a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping index ebc42fd84e..d0f2ec878e 100644 --- a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping +++ b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping @@ -7,10 +7,13 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator FIELD field_25173 boxShape Lnet/minecraft/class_265; FIELD field_25174 world Lnet/minecraft/class_1941; FIELD field_25175 checkEntity Z + FIELD field_25669 blockPredicate Ljava/util/function/BiPredicate; METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)V ARG 1 world ARG 2 entity ARG 3 box + METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)V + ARG 4 blockPredicate METHOD method_29283 getChunk (II)Lnet/minecraft/class_1922; ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/world/CollisionView.mapping b/mappings/net/minecraft/world/CollisionView.mapping index 580cd83f27..64348ed247 100644 --- a/mappings/net/minecraft/world/CollisionView.mapping +++ b/mappings/net/minecraft/world/CollisionView.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView - METHOD method_17892 doesNotCollide (Lnet/minecraft/class_1297;)Z + METHOD method_17892 isSpaceEmpty (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_18026 doesNotCollide (Lnet/minecraft/class_238;)Z + METHOD method_18026 isSpaceEmpty (Lnet/minecraft/class_238;)Z ARG 1 box METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; METHOD method_20812 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/stream/Stream; @@ -10,10 +10,12 @@ CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView METHOD method_22338 getExistingChunk (II)Lnet/minecraft/class_1922; ARG 1 chunkX ARG 2 chunkZ - METHOD method_8587 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z + METHOD method_30030 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)Ljava/util/stream/Stream; + METHOD method_30635 isBlockSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/BiPredicate;)Z + METHOD method_8587 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z ARG 1 entity ARG 2 box - METHOD method_8590 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Z + METHOD method_8590 isSpaceEmpty (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Z METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/function/Predicate;)Ljava/util/stream/Stream; METHOD method_8606 intersectsEntities (Lnet/minecraft/class_1297;)Z ARG 1 entity