From 59a527d6d2fafbe509484e66db57228d92ef0eb0 Mon Sep 17 00:00:00 2001 From: enbrain <69905075+enbrain@users.noreply.github.com> Date: Thu, 4 Nov 2021 21:00:14 +0900 Subject: [PATCH] Restore parameters lost in 21w44a update (#2810) --- mappings/net/minecraft/block/EntityShapeContext.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 7 +++++++ .../structure/pool/StructurePoolBasedGenerator.mapping | 4 +++- .../minecraft/util/profiling/jfr/FlightProfiler.mapping | 4 ++++ .../util/profiling/jfr/event/PacketEvent.mapping | 3 +++ mappings/net/minecraft/util/shape/VoxelShapes.mapping | 3 +++ mappings/net/minecraft/world/EntityView.mapping | 1 + .../biome/source/util/VanillaTerrainParameters.mapping | 4 ++++ .../world/gen/chunk/NoiseChunkGenerator.mapping | 1 + .../world/gen/surfacebuilder/SurfaceBuilder.mapping | 9 +++++++++ 10 files changed, 36 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/block/EntityShapeContext.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping index 3ab4180d79..54c42a466c 100644 --- a/mappings/net/minecraft/block/EntityShapeContext.mapping +++ b/mappings/net/minecraft/block/EntityShapeContext.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext ARG 4 boots ARG 5 heldItem ARG 6 walkOnFluidPredicate + ARG 7 entity METHOD method_27867 (Lnet/minecraft/class_3611;)Z ARG 0 fluid METHOD method_32480 getEntity ()Lnet/minecraft/class_1297; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index b496aebbf3..c1d1138758 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -127,6 +127,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6038 lastRenderX D FIELD field_6039 prevHorizontalSpeed F METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V + ARG 1 type ARG 2 world METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -137,6 +138,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 entityBoundingBox ARG 2 world ARG 3 context + ARG 4 collisions METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 movement METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; @@ -203,11 +205,16 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 destY ARG 5 destZ METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Ljava/util/List;)Lnet/minecraft/class_243; + ARG 0 entity + ARG 1 movement ARG 2 entityBoundingBox ARG 3 world ARG 4 context + ARG 5 collisions METHOD method_20737 adjustMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/List;)Lnet/minecraft/class_243; + ARG 0 movement ARG 1 entityBoundingBox + ARG 2 collisions METHOD method_20802 getFireTicks ()I METHOD method_20803 setFireTicks (I)V ARG 1 ticks diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index b8c8de27a4..c1008f5ec1 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe METHOD (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;I)V ARG 1 piece ARG 2 pieceShape - ARG 3 minY + ARG 3 currentSize CLASS class_4182 StructurePoolGenerator FIELD field_18700 maxSize I FIELD field_18701 pieceFactory Lnet/minecraft/class_3778$class_3779; @@ -45,3 +45,5 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 1 piece ARG 2 pieceShape ARG 3 minY + ARG 4 modifyBoundingBox + ARG 5 world diff --git a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping index 704e6231ed..987dca4632 100644 --- a/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/FlightProfiler.mapping @@ -11,7 +11,11 @@ CLASS net/minecraft/class_6611 net/minecraft/util/profiling/jfr/FlightProfiler ARG 2 world ARG 3 targetStatus METHOD method_38656 onPacketReceived (IILjava/net/SocketAddress;I)V + ARG 3 remoteAddress + ARG 4 bytes METHOD method_38657 onPacketSent (IILjava/net/SocketAddress;I)V + ARG 3 remoteAddress + ARG 4 bytes METHOD method_38658 isAvailable ()Z METHOD method_38659 startWorldLoadProfiling ()Lnet/minecraft/class_6613; CLASS class_6612 NoopProfiler diff --git a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping index 4568bf0c1e..db8a7b14a1 100644 --- a/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/event/PacketEvent.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_6509 net/minecraft/util/profiling/jfr/event/PacketEvent + METHOD (IILjava/net/SocketAddress;I)V + ARG 3 remoteAddress + ARG 4 bytes CLASS class_6510 Names FIELD field_34419 REMOTE_ADDRESS Ljava/lang/String; FIELD field_34421 BYTES Ljava/lang/String; diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 6d1d55fc19..d6047f0f1e 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -67,6 +67,7 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes METHOD method_1085 calculateMaxOffset (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Ljava/lang/Iterable;D)D ARG 0 axis ARG 1 box + ARG 2 shapes ARG 3 maxDist METHOD method_1086 findRequiredBitResolution (DD)I ARG 0 min @@ -87,12 +88,14 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 2 initial ARG 4 context ARG 5 direction + ARG 6 shapes METHOD method_17945 calculatePushVelocity (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Ljava/lang/Iterable;)D ARG 0 axis ARG 1 box ARG 2 world ARG 3 initial ARG 5 context + ARG 6 shapes METHOD method_20713 unionCoversFullCube (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Z ARG 0 one ARG 1 two diff --git a/mappings/net/minecraft/world/EntityView.mapping b/mappings/net/minecraft/world/EntityView.mapping index 571ca56f99..3996065f8e 100644 --- a/mappings/net/minecraft/world/EntityView.mapping +++ b/mappings/net/minecraft/world/EntityView.mapping @@ -55,6 +55,7 @@ CLASS net/minecraft/class_1924 net/minecraft/world/EntityView ARG 1 uuid METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/List; ARG 1 entity + ARG 2 box METHOD method_21726 getClosestEntity (Ljava/lang/Class;Lnet/minecraft/class_4051;Lnet/minecraft/class_1309;DDDLnet/minecraft/class_238;)Lnet/minecraft/class_1309; ARG 1 entityClass ARG 2 targetPredicate diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index 1f8e34d0b1..dc650e1649 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr FIELD field_34529 factorSpline Lnet/minecraft/class_6492; FIELD field_34530 peakSpline Lnet/minecraft/class_6492; FIELD field_34531 OFFSET_VALUE_OFFSET F + METHOD (Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;Lnet/minecraft/class_6492;)V + ARG 1 offsetSpline + ARG 2 factorSpline + ARG 3 peakSpline METHOD method_38207 getOffsetSpline ()Lnet/minecraft/class_6492; METHOD method_38208 getNormalizedWeirdness (F)F ARG 0 weirdness diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 19720da1a5..ca5cc2c050 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -47,5 +47,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 1 y ARG 2 z METHOD method_39041 (Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; + ARG 1 context ARG 3 chunk ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index 960ee6e09c..012807ba97 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -16,12 +16,18 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_35291 noiseSamplers Ljava/util/Map; FIELD field_35292 randomDeriver Lnet/minecraft/class_6574; FIELD field_35293 surfaceNoise Lnet/minecraft/class_5216; + METHOD (Lnet/minecraft/class_5818;Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;IJLnet/minecraft/class_2919$class_6675;)V + ARG 1 noiseColumnSampler METHOD method_39103 getTerracottaBlock (III)Lnet/minecraft/class_2680; ARG 1 x ARG 2 y ARG 3 z METHOD method_39104 (ILnet/minecraft/class_1959;Lnet/minecraft/class_6557;Lnet/minecraft/class_2338$class_2339;III)V ARG 2 biome + ARG 4 mutablePos + ARG 5 x + ARG 6 z + ARG 7 surfaceY METHOD method_39106 buildSurface (Lnet/minecraft/class_4543;Lnet/minecraft/class_2378;ZLnet/minecraft/class_5868;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_6686$class_6708;)V ARG 1 biomeAccess ARG 2 biomeRegistry @@ -39,4 +45,7 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 3 state METHOD method_39110 (Lnet/minecraft/class_6686$class_6708;Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 1 rule + ARG 2 context + ARG 4 chunk + ARG 5 pos METHOD method_39112 getNoiseSampler (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216;