diff --git a/mappings/net/minecraft/block/FluidDrainable.mapping b/mappings/net/minecraft/block/FluidDrainable.mapping index 3c8fd7bcd9..d3d24a90d3 100644 --- a/mappings/net/minecraft/block/FluidDrainable.mapping +++ b/mappings/net/minecraft/block/FluidDrainable.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_2263 net/minecraft/block/FluidDrainable - METHOD method_32351 getDrainSound ()Ljava/util/Optional; + METHOD method_32351 getBucketFillSound ()Ljava/util/Optional; + COMMENT Returns the sound played when filling a bucket with the fluid contained in this block. + COMMENT + COMMENT @see net.minecraft.fluid.Fluid#getBucketFillSound() METHOD method_9700 tryDrainFluid (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799; ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping index 4adb3b9154..22bc5dd283 100644 --- a/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/DoubleOptionSliderWidget.mapping @@ -8,4 +8,4 @@ CLASS net/minecraft/class_4040 net/minecraft/client/gui/widget/DoubleOptionSlide ARG 4 width ARG 5 height ARG 6 option - ARG 7 ordererTooltip + ARG 7 orderedTooltip diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 4fb8066ea8..53489b57e9 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -47,7 +47,7 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle METHOD method_3064 getBoundingBox ()Lnet/minecraft/class_238; METHOD method_3067 setBoundingBox (Lnet/minecraft/class_238;)V ARG 1 boundingBox - METHOD method_3068 getColorMultiplier (F)I + METHOD method_3068 getBrightness (F)I ARG 1 tint METHOD method_3069 move (DDD)V ARG 1 dx diff --git a/mappings/net/minecraft/fluid/FlowableFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping index 37ae5e4175..5ea980ba37 100644 --- a/mappings/net/minecraft/fluid/FlowableFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -48,12 +48,14 @@ CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid ARG 4 flowDirection ARG 5 flowTo ARG 6 flowToBlockState + ARG 7 fluidState + ARG 8 fluid METHOD method_15739 getLevelDecreasePerBlock (Lnet/minecraft/class_4538;)I ARG 1 world METHOD method_15740 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I ARG 1 world ARG 2 pos - METHOD method_15741 (Lnet/minecraft/class_3610;)I + METHOD method_15741 getBlockStateLevel (Lnet/minecraft/class_3610;)I ARG 0 state METHOD method_15742 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;ILnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap;Lit/unimi/dsi/fastutil/shorts/Short2BooleanMap;)I ARG 1 world diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index e7bcc3e59f..7560c10eaf 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid FIELD field_15905 stateManager Lnet/minecraft/class_2689; METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792; METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V + ARG 1 builder METHOD method_15776 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V ARG 1 world ARG 2 pos @@ -47,6 +48,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 world ARG 2 pos ARG 3 state + ARG 4 random METHOD method_15793 isStill (Lnet/minecraft/class_3610;)Z ARG 1 state METHOD method_15794 isEmpty ()Z @@ -57,4 +59,5 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 3 pos METHOD method_20784 getHeight (Lnet/minecraft/class_3610;)F ARG 1 state - METHOD method_32359 getFillSound ()Ljava/util/Optional; + METHOD method_32359 getBucketFillSound ()Ljava/util/Optional; + COMMENT Returns the sound played when filling a bucket with this fluid. diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping index 7eb4bcf56d..17dc516a81 100644 --- a/mappings/net/minecraft/fluid/FluidState.mapping +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState METHOD (Lnet/minecraft/class_3611;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V ARG 1 fluid ARG 2 propertiesMap + ARG 3 codec METHOD method_15756 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index aa6ac37d36..8616e630e0 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler FIELD field_17493 type Lnet/minecraft/class_3917; FIELD field_7757 quickCraftSlots Ljava/util/Set; FIELD field_7758 actionId S - FIELD field_7759 quickCraftButton I + FIELD field_7759 quickCraftStage I FIELD field_7760 restrictedPlayers Ljava/util/Set; FIELD field_7761 slots Lnet/minecraft/class_2371; - FIELD field_7762 quickCraftStage I + FIELD field_7762 quickCraftButton I FIELD field_7763 syncId I FIELD field_7764 trackedStacks Lnet/minecraft/class_2371; COMMENT A list of item stacks that is used for tracking changes in {@link #sendContentUpdates()}. @@ -29,10 +29,14 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 0 data ARG 1 expectedCount METHOD method_17362 addProperty (Lnet/minecraft/class_3915;)Lnet/minecraft/class_3915; + ARG 1 property METHOD method_17695 canUse (Lnet/minecraft/class_3914;Lnet/minecraft/class_1657;Lnet/minecraft/class_2248;)Z ARG 0 context ARG 1 player ARG 2 block + METHOD method_17696 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Ljava/lang/Boolean; + ARG 2 world + ARG 3 pos METHOD method_30010 removeStack (IILnet/minecraft/class_1713;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; ARG 1 slotIndex ARG 2 clickData @@ -82,6 +86,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 2 value METHOD method_7607 dropInventory (Lnet/minecraft/class_1657;Lnet/minecraft/class_1263;)V ARG 1 player + ARG 2 inventory METHOD method_7608 calculateComparatorOutput (Lnet/minecraft/class_2586;)I ARG 0 entity METHOD method_7609 onContentChanged (Lnet/minecraft/class_1263;)V diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping index 596b689805..f818e4b07b 100644 --- a/mappings/net/minecraft/state/StateManager.mapping +++ b/mappings/net/minecraft/state/StateManager.mapping @@ -28,3 +28,4 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object; ARG 1 owner ARG 2 entries + ARG 3 codec diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping index bfe6042b65..49c947dfe1 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -1,3 +1,7 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader FIELD field_25749 tagManager Lnet/minecraft/class_5415; + FIELD field_28311 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_28312 registryManager Lnet/minecraft/class_5455; + METHOD (Lnet/minecraft/class_5455;)V + ARG 1 registryManager METHOD method_30223 getTagManager ()Lnet/minecraft/class_5415; diff --git a/mappings/net/minecraft/util/ItemScatterer.mapping b/mappings/net/minecraft/util/ItemScatterer.mapping index 3e95adacf3..88bc569a68 100644 --- a/mappings/net/minecraft/util/ItemScatterer.mapping +++ b/mappings/net/minecraft/util/ItemScatterer.mapping @@ -1,14 +1,17 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer FIELD field_5797 RANDOM Ljava/util/Random; + METHOD method_17348 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V + ARG 2 stack METHOD method_17349 spawn (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2371;)V ARG 0 world ARG 1 pos - ARG 2 items + ARG 2 stacks METHOD method_5449 spawn (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1799;)V + ARG 0 world ARG 1 x ARG 3 y ARG 5 z - ARG 7 item + ARG 7 stack METHOD method_5450 spawn (Lnet/minecraft/class_1937;DDDLnet/minecraft/class_1263;)V ARG 0 world ARG 1 x @@ -16,4 +19,10 @@ CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer ARG 5 z ARG 7 inventory METHOD method_5451 spawn (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1263;)V + ARG 0 world + ARG 1 pos + ARG 2 inventory METHOD method_5452 spawn (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;Lnet/minecraft/class_1263;)V + ARG 0 world + ARG 1 entity + ARG 2 inventory diff --git a/mappings/net/minecraft/util/UserCache.mapping b/mappings/net/minecraft/util/UserCache.mapping index 105bfc1bca..7d49c49afb 100644 --- a/mappings/net/minecraft/util/UserCache.mapping +++ b/mappings/net/minecraft/util/UserCache.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache FIELD field_14314 cacheFile Ljava/io/File; FIELD field_14315 profileRepository Lcom/mojang/authlib/GameProfileRepository; FIELD field_14318 gson Lcom/google/gson/Gson; + FIELD field_25805 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lcom/mojang/authlib/GameProfileRepository;Ljava/io/File;)V ARG 1 profileRepository ARG 2 cacheFile @@ -20,6 +21,7 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache METHOD method_14516 getLastAccessedEntries (I)Ljava/util/stream/Stream; METHOD method_14517 load ()Ljava/util/List; METHOD method_14518 save ()V + METHOD method_30170 getDateFormat ()Ljava/text/DateFormat; CLASS 1 METHOD onProfileLookupFailed (Lcom/mojang/authlib/GameProfile;Ljava/lang/Exception;)V ARG 1 profile @@ -29,5 +31,8 @@ CLASS net/minecraft/class_3312 net/minecraft/util/UserCache CLASS class_3313 Entry FIELD field_14319 expirationDate Ljava/util/Date; FIELD field_14321 profile Lcom/mojang/authlib/GameProfile; + METHOD (Lcom/mojang/authlib/GameProfile;Ljava/util/Date;)V + ARG 1 profile + ARG 2 expirationDate METHOD method_14519 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_14520 getExpirationDate ()Ljava/util/Date; diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index 534cca239f..4465285dd8 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -75,6 +75,8 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box ARG 1 scale METHOD method_19316 from (Lnet/minecraft/class_3341;)Lnet/minecraft/class_238; ARG 0 mutable + METHOD method_29968 from (Lnet/minecraft/class_243;)Lnet/minecraft/class_238; + ARG 0 vec3d METHOD method_30048 of (DDD)Lnet/minecraft/class_238; ARG 0 x ARG 2 y diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index b531631083..6dfc4235bc 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 2 max METHOD method_15341 floorMod (FF)F METHOD method_15342 log2DeBruijn (I)I + ARG 0 value METHOD method_15343 parseInt (Ljava/lang/String;I)I ARG 0 string ARG 1 fallback @@ -41,33 +42,40 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 2 min ARG 4 max METHOD method_15351 log2 (I)I + ARG 0 value METHOD method_15352 isPowerOfTwo (I)Z + ARG 0 value METHOD method_15353 packRgb (FFF)I ARG 0 r ARG 1 g ARG 2 b METHOD method_15354 idealHash (I)I METHOD method_15355 sqrt (F)F + ARG 0 value METHOD method_15356 angleBetween (FF)F ARG 0 first ARG 1 second METHOD method_15357 floor (D)I + ARG 0 value METHOD method_15360 binarySearch (IILjava/util/function/IntPredicate;)I ARG 0 start ARG 1 end ARG 2 leftPredicate METHOD method_15362 cos (F)F + ARG 0 value METHOD method_15363 clamp (FFF)F ARG 0 value ARG 1 min ARG 2 max METHOD method_15365 fastFloor (D)I + ARG 0 value METHOD method_15366 nextDouble (Ljava/util/Random;DD)D ARG 0 random ARG 1 min ARG 3 max METHOD method_15367 floorMod (DD)D METHOD method_15368 sqrt (D)F + ARG 0 value METHOD method_15369 hsvToRgb (FFF)I ARG 0 hue ARG 1 saturation @@ -87,25 +95,32 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 1 y ARG 2 z METHOD method_15372 lfloor (D)J + ARG 0 value METHOD method_15373 average ([J)D ARG 0 array METHOD method_15374 sin (F)F + ARG 0 value METHOD method_15375 floor (F)I + ARG 0 value METHOD method_15378 randomUuid (Ljava/util/Random;)Ljava/util/UUID; ARG 0 random METHOD method_15379 abs (F)F + ARG 0 value METHOD method_15381 subtractAngles (FF)F ARG 0 start ARG 1 end METHOD method_15382 abs (I)I + ARG 0 value METHOD method_15383 packRgb (III)I ARG 0 r ARG 1 g ARG 2 b METHOD method_15384 ceil (D)I + ARG 0 value METHOD method_15385 fractionalPart (D)D ARG 0 value METHOD method_15386 ceil (F)I + ARG 0 value METHOD method_15387 floorMod (II)I METHOD method_15388 stepUnwrappedAngleTowards (FFF)F COMMENT Steps from {@code from} degrees towards {@code to} degrees, changing the value by at most {@code step} degrees. diff --git a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping index efa44b8fb6..63a165fa5b 100644 --- a/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/BitSetVoxelSet.mapping @@ -20,3 +20,17 @@ CLASS net/minecraft/class_244 net/minecraft/util/shape/BitSetVoxelSet ARG 4 zPoints ARG 5 function METHOD method_1059 isColumnFull (IIII)Z + METHOD method_31939 (IIIIIIIII)Lnet/minecraft/class_244; + ARG 0 xSize + ARG 1 ySize + ARG 2 zSize + ARG 3 xMin + ARG 4 yMin + ARG 5 zMin + ARG 6 xMax + ARG 7 yMax + ARG 8 zMax + METHOD method_31940 (IIIZ)V + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping b/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping index 018eb488ab..e18918870e 100644 --- a/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping +++ b/mappings/net/minecraft/util/shape/CroppedVoxelSet.mapping @@ -14,3 +14,6 @@ CLASS net/minecraft/class_262 net/minecraft/util/shape/CroppedVoxelSet ARG 5 xMax ARG 6 yMax ARG 7 zMax + METHOD method_31944 clamp (Lnet/minecraft/class_2350$class_2351;I)I + ARG 1 axis + ARG 2 value diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index c46c2aff24..4e233ea2f7 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -11,18 +11,28 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 1 start ARG 2 end ARG 3 pos + METHOD method_1094 ([Lnet/minecraft/class_265;DDDDDD)V + ARG 1 xMin + ARG 3 yMin + ARG 5 zMin + ARG 7 xMax + ARG 9 yMax + ARG 11 zMax METHOD method_1096 offset (DDD)Lnet/minecraft/class_265; ARG 1 x ARG 3 y ARG 5 z METHOD method_1097 simplify ()Lnet/minecraft/class_265; METHOD method_1098 getUncachedFace (Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; + ARG 1 direction METHOD method_1099 getPointPosition (Lnet/minecraft/class_2350$class_2351;I)D ARG 1 axis ARG 2 index METHOD method_1100 getCoordIndex (Lnet/minecraft/class_2350$class_2351;D)I + ARG 1 axis ARG 2 coord METHOD method_1102 getEndingCoord (Lnet/minecraft/class_2350$class_2351;DD)D + ARG 1 axis ARG 2 from ARG 4 to METHOD method_1103 calculateMaxDistance (Lnet/minecraft/class_2335;Lnet/minecraft/class_238;D)D @@ -40,5 +50,12 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape METHOD method_1109 getPointPositions (Lnet/minecraft/class_2350$class_2351;)Lit/unimi/dsi/fastutil/doubles/DoubleList; ARG 1 axis METHOD method_1110 isEmpty ()Z + METHOD method_1111 (Ljava/util/List;DDDDDD)V + ARG 1 x1 + ARG 3 y1 + ARG 5 z1 + ARG 7 x2 + ARG 9 y2 + ARG 11 z2 METHOD method_20538 getFace (Lnet/minecraft/class_2350;)Lnet/minecraft/class_265; ARG 1 facing diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index 7952decf5c..325b8cadcd 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -90,6 +90,7 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes 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/util/stream/Stream;)D + ARG 0 axis ARG 1 box ARG 2 world ARG 3 initial