Merge branch '18w50a' of github.com:FabricMC/pomf into 18w50a

mappings/ctf.mapping

@@ -1,5 +0,0 @@
-CLASS ctf
-	METHOD a draw (IIF)V
-		ARG 1 mouseX
-		ARG 2 mouseY
-	METHOD ap_ canClose ()Z

mappings/net/minecraft/client/gui/CloseWorldGui.mapping

@@ -0,0 +1,8 @@
+CLASS ctf net/minecraft/client/gui/CloseWorldGui
+	FIELD a message Ljava/lang/String;
+	METHOD <init> (Ljava/lang/String;)V
+		ARG 1 message
+	METHOD a draw (IIF)V
+		ARG 1 mouseX
+		ARG 2 mouseY
+	METHOD ap_ canClose ()Z

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 <init> (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

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

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

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -62,7 +62,9 @@ CLASS ahe net/minecraft/entity/LivingEntity
 		ARG 10 xzDistance
 	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

mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping

@@ -48,6 +48,7 @@ CLASS aol net/minecraft/entity/decoration/ArmorStandEntity
 	METHOD a onTrackedDataSet (Lpr;)V
 	METHOD a onMarkerValueChange (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;

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

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

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

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

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;

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

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

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

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

mappings/net/minecraft/stat/ServerStatHandler.mapping

@@ -0,0 +1,17 @@
+CLASS xs net/minecraft/stat/ServerStatHandler
+	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD c server Lnet/minecraft/server/MinecraftServer;
+	FIELD d file Ljava/io/File;
+	METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;)V
+		ARG 1 server
+	METHOD a save ()V
+	METHOD a setStat (Larb;Lxt;I)V
+		ARG 1 player
+		ARG 2 stat
+		ARG 3 value
+	METHOD a jsonToCompound (Lcom/google/gson/JsonObject;)Lhs;
+	METHOD a parse (Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;)V
+		ARG 1 dataFixer
+		ARG 2 json
+	METHOD b asString ()Ljava/lang/String;
+		ARG 3 object

mappings/net/minecraft/stat/StatHandler.mapping

@@ -0,0 +1,12 @@
+CLASS xx net/minecraft/stat/StatHandler
+	FIELD a statMap Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	METHOD a setStat (Larb;Lxt;I)V
+		ARG 1 player
+		ARG 2 stat
+		ARG 3 value
+	METHOD a getStat (Lxt;)I
+		ARG 1 stat
+	METHOD b increaseStat (Larb;Lxt;I)V
+		ARG 1 player
+		ARG 2 stat
+		ARG 3 value

mappings/net/minecraft/util/LoopingStream.mapping

@@ -0,0 +1,2 @@
+CLASS yy net/minecraft/util/LoopingStream
+	METHOD a getStream ()Ljava/util/stream/Stream;

mappings/net/minecraft/util/OffsetDoubleList.mapping

@@ -0,0 +1,8 @@
+CLASS cmt net/minecraft/util/OffsetDoubleList
+	FIELD a oldList Lit/unimi/dsi/fastutil/doubles/DoubleList;
+	FIELD b offset D
+	METHOD <init> (Lit/unimi/dsi/fastutil/doubles/DoubleList;D)V
+		ARG 1 oldList
+		ARG 2 offset
+	METHOD getDouble (I)D
+		ARG 1 position

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

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

mappings/xs.mapping

@@ -1,4 +0,0 @@
-CLASS xs
-	FIELD b LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD c server Lnet/minecraft/server/MinecraftServer;
-	FIELD d file Ljava/io/File;