From 35e4e4b39e731b64bca5b5413a9ddddeb805bd29 Mon Sep 17 00:00:00 2001 From: sekwah41 Date: Sat, 22 Dec 2018 18:15:59 +0000 Subject: [PATCH] Updated a bunch of entity and world collision names (#338) --- mappings/net/minecraft/entity/Entity.mapping | 10 ++++++++++ .../net/minecraft/entity/ExperienceOrbEntity.mapping | 1 + mappings/net/minecraft/entity/ItemEntity.mapping | 1 + mappings/net/minecraft/entity/LivingEntity.mapping | 2 ++ .../entity/decoration/ArmorStandEntity.mapping | 1 + mappings/net/minecraft/entity/mob/SlimeEntity.mapping | 1 + .../net/minecraft/entity/passive/BatEntity.mapping | 1 + .../minecraft/entity/passive/HorseBaseEntity.mapping | 1 + .../net/minecraft/entity/passive/ParrotEntity.mapping | 1 + .../minecraft/entity/passive/PufferfishEntity.mapping | 1 + .../entity/projectile/ProjectileEntity.mapping | 1 + .../minecraft/entity/projectile/TridentEntity.mapping | 1 + .../entity/vehicle/AbstractMinecartEntity.mapping | 1 + .../net/minecraft/entity/vehicle/BoatEntity.mapping | 1 + mappings/net/minecraft/util/LoopingStream.mapping | 2 ++ mappings/net/minecraft/util/shape/VoxelShapes.mapping | 2 +- mappings/net/minecraft/world/ViewableWorld.mapping | 8 ++++++++ 17 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/util/LoopingStream.mapping diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index f06f275d9d..cbc2d30016 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -1,4 +1,7 @@ CLASS agv net/minecraft/entity/Entity + FIELD A verticalCollision Z + FIELD B collided Z + FIELD C velocityModified Z FIELD D movementMultiplierSet Z FIELD F invalid Z FIELD G width F @@ -9,6 +12,7 @@ CLASS agv net/minecraft/entity/Entity FIELD O prevRenderZ D FIELD P stepHeight F FIELD Q noClip Z + FIELD R pushSpeedReduction F FIELD S random Ljava/util/Random; FIELD T age I FIELD U insideWater Z @@ -27,6 +31,7 @@ CLASS agv net/minecraft/entity/Entity FIELD ad chunkX I FIELD ae chunkY I FIELD af chunkZ I + FIELD aj ignoreCameraFrustum Z FIELD ak velocityDirty Z FIELD al portalCooldown I FIELD am inPortal Z @@ -61,6 +66,7 @@ CLASS agv net/minecraft/entity/Entity FIELD w prevYaw F FIELD x prevPitch F FIELD y onGround Z + FIELD z horizontalCollision Z METHOD (Lagz;Lbbp;)V ARG 1 type METHOD B_ getPistonBehavior ()Lcfj; @@ -103,6 +109,7 @@ CLASS agv net/minecraft/entity/Entity ARG 2 x ARG 4 y ARG 6 z + ARG 21 collisionVoxelStream METHOD a onStruckByLightning (Laov;)V METHOD a interactAt (Larb;Lcmd;Lafo;)Lafq; ARG 1 player @@ -155,7 +162,9 @@ CLASS agv net/minecraft/entity/Entity METHOD a toListTag ([D)Lhy; METHOD a toListTag ([F)Lhy; METHOD aA getLightmapCoordinates ()I + METHOD aC scheduleVelocityUpdate ()V METHOD aD doesCollide ()Z + METHOD aE isPushable ()Z METHOD aF shouldSetPositionOnLoad ()Z METHOD aG getSavedEntityId ()Ljava/lang/String; METHOD aH isValid ()Z @@ -200,6 +209,7 @@ CLASS agv net/minecraft/entity/Entity METHOD b setEntityFlag (IZ)V ARG 1 index METHOD b isInvulnerableTo (Lage;)Z + METHOD b onPlayerCollision (Larb;)V METHOD b interact (Larb;Lafo;)Z ARG 1 player METHOD b writeCustomDataToTag (Lhs;)V diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index 5009a5f988..85c3e4a9c1 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -15,6 +15,7 @@ CLASS ahb net/minecraft/entity/ExperienceOrbEntity METHOD a readCustomDataFromTag (Lhs;)V METHOD aA getLightmapCoordinates ()I METHOD aw onSwimmingStart ()V + METHOD b onPlayerCollision (Larb;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD g burn (I)V METHOD i getExperienceAmount ()I diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index 8b230567c5..faf99bcadd 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -28,6 +28,7 @@ CLASS aoy net/minecraft/entity/ItemEntity METHOD a tryMerge (Laoy;)Z METHOD a changeDimension (Lbsg;)Lagv; METHOD a readCustomDataFromTag (Lhs;)V + METHOD b onPlayerCollision (Larb;)V METHOD b setStack (Lawo;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD b setOwner (Ljava/util/UUID;)V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 038429eacc..e361e125fc 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -58,7 +58,9 @@ CLASS ahe net/minecraft/entity/LivingEntity ARG 2 target METHOD a readCustomDataFromTag (Lhs;)V METHOD a onTrackedDataSet (Lpr;)V + METHOD aC scheduleVelocityUpdate ()V METHOD aD doesCollide ()Z + METHOD aE isPushable ()Z METHOD aH isValid ()Z METHOD aV getItemsArmor ()Ljava/lang/Iterable; METHOD ac destroy ()V diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index 2415995bae..0efe6a8109 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -46,6 +46,7 @@ CLASS aol net/minecraft/entity/decoration/ArmorStandEntity METHOD a onTrackedDataSet (Lpr;)V METHOD a onSmallValueChange (Z)V METHOD aD doesCollide ()Z + METHOD aE isPushable ()Z METHOD aK getHeightOffset ()D METHOD aU getItemsHand ()Ljava/lang/Iterable; METHOD aV getItemsArmor ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping index d470c96022..adb655c313 100644 --- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping @@ -29,6 +29,7 @@ CLASS aqe net/minecraft/entity/mob/SlimeEntity METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a readCustomDataFromTag (Lhs;)V METHOD a onTrackedDataSet (Lpr;)V + METHOD b onPlayerCollision (Larb;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD bG getEyeHeight ()F METHOD cH getSoundVolume ()F diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping index c5edc435df..92e85040f1 100644 --- a/mappings/net/minecraft/entity/passive/BatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping @@ -10,6 +10,7 @@ CLASS alv net/minecraft/entity/passive/BatEntity METHOD a canSpawn (Lbbq;Lahh;)Z METHOD a readCustomDataFromTag (Lhs;)V METHOD a setRoosting (Z)V + METHOD aE isPushable ()Z METHOD b writeCustomDataToTag (Lhs;)V METHOD bG getEyeHeight ()F METHOD bs canAvoidTraps ()Z diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping index cd86224b19..e0574b6cdf 100644 --- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping @@ -21,6 +21,7 @@ CLASS ana net/minecraft/entity/passive/HorseBaseEntity METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos METHOD a readCustomDataFromTag (Lhs;)V + METHOD aE isPushable ()Z METHOD a_ setJumpStrength (I)V METHOD b startJumping (I)V METHOD b writeCustomDataToTag (Lhs;)V diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index c1f3af2be3..8332d2d192 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -14,6 +14,7 @@ CLASS aml net/minecraft/entity/passive/ParrotEntity METHOD a playStepSound (Let;Lbpm;)V ARG 1 pos METHOD a readCustomDataFromTag (Lhs;)V + METHOD aE isPushable ()Z METHOD b createNavigation (Lbbp;)Lalg; METHOD b writeCustomDataToTag (Lhs;)V METHOD bG getEyeHeight ()F diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping index 788b0c4314..381711f0a9 100644 --- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping @@ -10,6 +10,7 @@ CLASS amo net/minecraft/entity/passive/PufferfishEntity ARG 1 width METHOD a readCustomDataFromTag (Lhs;)V METHOD a onTrackedDataSet (Lpr;)V + METHOD b onPlayerCollision (Larb;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD cv getDeathSound ()Lxm; METHOD dA getFlopSound ()Lxm; diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index a4ce6bc338..861a992669 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -39,6 +39,7 @@ CLASS arf net/minecraft/entity/projectile/ProjectileEntity METHOD a setSound (Lxm;)V METHOD a setCritical (Z)V METHOD b setFlagByte (B)V + METHOD b onPlayerCollision (Larb;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD bG getEyeHeight ()F METHOD c setDamage (D)V diff --git a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping index 3abea04218..a6405f7de6 100644 --- a/mappings/net/minecraft/entity/projectile/TridentEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/TridentEntity.mapping @@ -3,6 +3,7 @@ CLASS asc net/minecraft/entity/projectile/TridentEntity FIELD ay dealtDamage Z METHOD W_ update ()V METHOD a readCustomDataFromTag (Lhs;)V + METHOD b onPlayerCollision (Larb;)V METHOD b writeCustomDataToTag (Lhs;)V METHOD g shouldRenderFrom (DDD)Z ARG 1 x diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 4135136215..800e1d9558 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -36,6 +36,7 @@ CLASS asi net/minecraft/entity/vehicle/AbstractMinecartEntity METHOD a readCustomDataFromTag (Lhs;)V METHOD a setCustomBlockPresent (Z)V METHOD aD doesCollide ()Z + METHOD aE isPushable ()Z METHOD aL getMountedHeightOffset ()D METHOD b setPosition (DDD)V ARG 1 x diff --git a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping index 8ecec7ae74..465906deaf 100644 --- a/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/BoatEntity.mapping @@ -31,6 +31,7 @@ CLASS ask net/minecraft/entity/vehicle/BoatEntity METHOD a readCustomDataFromTag (Lhs;)V METHOD a setPaddleState (ZZ)V METHOD aD doesCollide ()Z + METHOD aE isPushable ()Z METHOD aL getMountedHeightOffset ()D METHOD b interact (Larb;Lafo;)Z ARG 1 player diff --git a/mappings/net/minecraft/util/LoopingStream.mapping b/mappings/net/minecraft/util/LoopingStream.mapping new file mode 100644 index 0000000000..7956bbdb40 --- /dev/null +++ b/mappings/net/minecraft/util/LoopingStream.mapping @@ -0,0 +1,2 @@ +CLASS yy net/minecraft/util/LoopingStream + METHOD a getStream ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index b079e4acfc..a4b6055eb0 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -17,7 +17,7 @@ CLASS cmu net/minecraft/util/shape/VoxelShapes ARG 0 box METHOD a union (Lcmx;Lcmx;)Lcmx; METHOD a combine (Lcmx;Lcmx;Lcmh;)Lcmx; - METHOD a (Ley$a;Lclz;Ljava/util/stream/Stream;D)D + METHOD a calculateMaxOffset (Ley$a;Lclz;Ljava/util/stream/Stream;D)D ARG 0 axis ARG 1 box ARG 2 shapes diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index ab4c42b630..656988a0c2 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -10,6 +10,14 @@ CLASS bbt net/minecraft/world/ViewableWorld ARG 3 minZ ARG 4 maxX METHOD a getClosestPlayer (Lagv;D)Larb; + METHOD a getCollisionVoxelShapes (Lagv;Lclz;DDD)Ljava/util/stream/Stream; + ARG 3 x + ARG 5 y + ARG 7 z + METHOD a getCollisionVoxelShapes (Lagv;Lclz;Ljava/util/Set;DDD)Ljava/util/stream/Stream; + ARG 4 x + ARG 6 y + ARG 8 z METHOD a getTop (Lbst$a;II)I ARG 1 type ARG 2 x