Skip to content

Commit

Permalink
25w04a a bit more (#4098)
Browse files Browse the repository at this point in the history
  • Loading branch information
Shnupbups authored Jan 23, 2025
1 parent fa960e1 commit 0472c7d
Show file tree
Hide file tree
Showing 18 changed files with 113 additions and 4 deletions.
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
METHOD method_63499 getTranslationKey ()Ljava/lang/String;
METHOD method_64022 getInsideCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Lnet/minecraft/class_265;
ARG 1 state
ARG 2 world
ARG 3 pos
ARG 4 entity
METHOD method_66388 onStateReplaced (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)V
ARG 1 state
ARG 2 world
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/entity/Sherds.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ CLASS net/minecraft/class_8526 net/minecraft/block/entity/Sherds
ARG 0 nbt
METHOD method_57592 (Ljava/util/Optional;)Lnet/minecraft/class_1792;
ARG 0 item
METHOD method_67242 appendSherdTooltip (Ljava/util/function/Consumer;Ljava/util/Optional;)V
ARG 0 textConsumer
ARG 1 sherdItem
3 changes: 3 additions & 0 deletions mappings/net/minecraft/block/entity/Spawner.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ CLASS net/minecraft/class_8959 net/minecraft/block/entity/Spawner
METHOD method_55119 (Lnet/minecraft/class_1299;)Lnet/minecraft/class_5250;
ARG 0 entityType
METHOD method_55120 getSpawnedEntityText (Lnet/minecraft/class_9279;Ljava/lang/String;)Lnet/minecraft/class_2561;
ARG 0 nbtComponent
ARG 1 spawnDataKey
METHOD method_55121 appendSpawnDataToTooltip (Lnet/minecraft/class_9279;Ljava/util/function/Consumer;Ljava/lang/String;)V
ARG 0 nbtComponent
ARG 1 textConsumer
ARG 2 spawnDataKey
METHOD method_55122 getSpawnedEntityId (Lnet/minecraft/class_2487;Ljava/lang/String;)Lnet/minecraft/class_2960;
ARG 0 nbt
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/client/color/block/BlockColors.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,8 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors
ARG 1 world
ARG 2 pos
ARG 3 tintIndex
METHOD method_67245 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 tintIndex
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/option/VideoOption
METHOD method_60339 (Lnet/minecraft/class_313;Lnet/minecraft/class_2561;Ljava/lang/Integer;)Lnet/minecraft/class_2561;
ARG 1 optionText
ARG 2 value
METHOD method_67265 updateFullscreenButtonValue (Z)V
ARG 1 fullscreen
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,40 @@ CLASS net/minecraft/class_2414 net/minecraft/data/advancement/vanilla/VanillaHus
FIELD field_38467 EGG_LAYING_ANIMALS Ljava/util/List;
METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;)Lnet/minecraft/class_161$class_162;
ARG 0 builder
ARG 1 itemRegistry
METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;)Lnet/minecraft/class_161$class_162;
ARG 0 builder
ARG 1 itemRegistry
METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;)Lnet/minecraft/class_161$class_162;
ARG 0 builder
ARG 1 itemRegistry
METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;Ljava/util/stream/Stream;Lnet/minecraft/class_7871;Ljava/util/stream/Stream;)Lnet/minecraft/class_161$class_162;
ARG 0 advancementBuilder
ARG 0 builder
ARG 1 breedableAnimals
ARG 2 entityTypeRegistry
ARG 3 eggLayingAnimals
METHOD method_16117 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_6880$class_6883;)V
ARG 1 entry
METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225;)Lnet/minecraft/class_161$class_162;
ARG 0 builder
ARG 1 catVariantRegistry
METHOD method_43362 requireAllFrogsOnLeads (Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_7225;Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
ARG 0 entityTypeRegistry
ARG 1 itemRegistry
ARG 2 frogVariantRegistry
ARG 3 builder
METHOD method_43363 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Lnet/minecraft/class_7871;Lnet/minecraft/class_6880$class_6883;)V
ARG 3 entry
METHOD method_47810 createBreedAllAnimalsAdvancement (Lnet/minecraft/class_8779;Ljava/util/function/Consumer;Lnet/minecraft/class_7871;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/class_8779;
ARG 0 parent
ARG 1 exporter
ARG 2 entityTypeRegistry
ARG 3 breedableAnimals
ARG 4 eggLayingAnimals
METHOD method_48497 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Lnet/minecraft/class_1299;)V
ARG 2 entityType
METHOD method_48498 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Lnet/minecraft/class_1299;)V
ARG 2 entityType
METHOD method_58572 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960;
ARG 0 entry
METHOD method_59775 requireAllWolvesTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_161$class_162;
Expand Down
8 changes: 8 additions & 0 deletions mappings/net/minecraft/entity/Entity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -2279,6 +2279,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_66248 isControlledByMainPlayer ()Z
METHOD method_66249 canMoveVoluntarily ()Z
METHOD method_66250 spawnBubbleColumnParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
ARG 0 world
ARG 1 pos
METHOD method_66648 collidesWithFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_2338;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z
ARG 1 state
Expand All @@ -2301,6 +2302,13 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_66654 setApplicableComponent (Lnet/minecraft/class_9331;Ljava/lang/Object;)Z
ARG 1 type
ARG 2 value
METHOD method_67123 applyBubbleColumnSurfaceEffects (Lnet/minecraft/class_1297;ZLnet/minecraft/class_2338;)V
ARG 0 entity
ARG 1 drag
ARG 2 pos
METHOD method_67124 applyBubbleColumnEffects (Lnet/minecraft/class_1297;Z)V
ARG 0 entity
ARG 1 drag
METHOD method_7325 isSpectator ()Z
COMMENT {@return whether the entity is a spectator}
COMMENT
Expand Down
3 changes: 3 additions & 0 deletions mappings/net/minecraft/entity/LivingEntity.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_6089 containsOnlyAmbientEffects (Ljava/util/Collection;)Z
ARG 0 effects
METHOD method_6090 takeShieldHit (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;)V
ARG 1 world
ARG 2 attacker
METHOD method_6091 travel (Lnet/minecraft/class_243;)V
COMMENT Allows you to do certain speed and velocity calculations. This is useful for custom vehicle behavior, or custom entity movement. This is not to be confused with AI.
COMMENT
Expand Down Expand Up @@ -743,5 +745,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
ARG 1 fallDistance
METHOD method_66670 (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799;
ARG 0 slot
METHOD method_67125 getWeaponDisableBlockingForSeconds ()F
METHOD method_7292 getLuck ()F
CLASS class_6823 FallSounds
8 changes: 8 additions & 0 deletions mappings/net/minecraft/item/ThrowablePotionItem.mapping
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
CLASS net/minecraft/class_4537 net/minecraft/item/ThrowablePotionItem
FIELD field_55046 POWER F
METHOD method_67195 createEntity (Lnet/minecraft/class_3218;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1686;
ARG 1 world
ARG 2 user
ARG 3 stack
METHOD method_67196 createEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2374;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1686;
ARG 1 world
ARG 2 pos
ARG 3 stack
1 change: 1 addition & 0 deletions mappings/net/minecraft/predicate/NbtPredicate.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate
METHOD method_9072 test (Lnet/minecraft/class_1297;)Z
ARG 1 entity
METHOD method_9074 test (Lnet/minecraft/class_9473;)Z
ARG 1 components
METHOD method_9076 entityToNbt (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487;
ARG 0 entity
METHOD method_9077 test (Lnet/minecraft/class_2520;)Z
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/predicate/NumberRange.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange
METHOD method_53193 (Lnet/minecraft/class_2096;)Lnet/minecraft/class_2096;
ARG 0 range
METHOD method_53194 getConstantValue ()Ljava/util/Optional;
METHOD method_67180 createPacketCodec (Lnet/minecraft/class_9139;Lnet/minecraft/class_2096$class_2097;)Lnet/minecraft/class_9139;
ARG 0 valuePacketCodec
ARG 1 rangeFactory
METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/util/Optional;
ARG 0 reader
ARG 1 converter
Expand All @@ -41,6 +44,7 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange
FIELD comp_1807 squaredMin Ljava/util/Optional;
FIELD comp_1808 squaredMax Ljava/util/Optional;
FIELD field_45762 CODEC Lcom/mojang/serialization/Codec;
FIELD field_56293 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_9705 ANY Lnet/minecraft/class_2096$class_2099;
METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;)V
ARG 1 min
Expand Down Expand Up @@ -79,6 +83,7 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange
FIELD comp_1809 minSquared Ljava/util/Optional;
FIELD comp_1810 maxSquared Ljava/util/Optional;
FIELD field_45763 CODEC Lcom/mojang/serialization/Codec;
FIELD field_56294 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_9708 ANY Lnet/minecraft/class_2096$class_2100;
METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;)V
ARG 1 min
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CLASS net/minecraft/class_9365 net/minecraft/predicate/item/ComponentSubPredicate
METHOD method_58163 getComponentType ()Lnet/minecraft/class_9331;
METHOD method_58167 test (Ljava/lang/Object;)Z
ARG 1 component
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/class_8060 net/minecraft/recipe/SmithingTransformRecipe
FIELD field_52605 ingredientPlacement Lnet/minecraft/class_9887;
METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_1856;Ljava/util/Optional;Lnet/minecraft/class_10591;)V
ARG 1 template
ARG 2 base
ARG 3 addition
ARG 4 result
CLASS class_8061 Serializer
Expand Down
19 changes: 19 additions & 0 deletions mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@ CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe
FIELD field_42036 base Lnet/minecraft/class_1856;
FIELD field_42037 addition Lnet/minecraft/class_1856;
FIELD field_52606 ingredientPlacement Lnet/minecraft/class_9887;
FIELD field_56321 pattern Lnet/minecraft/class_6880;
METHOD <init> (Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_6880;)V
ARG 1 template
ARG 2 base
ARG 3 addition
ARG 4 pattern
METHOD method_64996 craft (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)Lnet/minecraft/class_1799;
ARG 0 registries
ARG 1 base
ARG 2 addition
ARG 3 pattern
CLASS class_8063 Serializer
FIELD field_46109 CODEC Lcom/mojang/serialization/MapCodec;
FIELD field_48365 PACKET_CODEC Lnet/minecraft/class_9139;
Expand All @@ -16,3 +23,15 @@ CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe
ARG 0 recipe
METHOD method_53787 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856;
ARG 0 recipe
METHOD method_67216 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_67217 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_6880;
ARG 0 recipe
METHOD method_67218 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856;
ARG 0 recipe
METHOD method_67219 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856;
ARG 0 recipe
METHOD method_67220 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_1856;
ARG 0 recipe
METHOD method_67221 (Lnet/minecraft/class_8062;)Lnet/minecraft/class_6880;
ARG 0 recipe
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/class_8044 net/minecraft/server/command/SpawnArmorTrimsComma
FIELD field_41887 MATERIALS Ljava/util/List;
FIELD field_41888 PATTERN_INDEX_GETTER Ljava/util/function/ToIntFunction;
FIELD field_41889 MATERIAL_INDEX_GETTER Ljava/util/function/ToIntFunction;
FIELD field_56241 INVALID_PATTERN_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD method_48333 register (Lcom/mojang/brigadier/CommandDispatcher;)V
ARG 0 dispatcher
METHOD method_48334 (Lcom/mojang/brigadier/context/CommandContext;)I
Expand All @@ -12,3 +13,23 @@ CLASS net/minecraft/class_8044 net/minecraft/server/command/SpawnArmorTrimsComma
METHOD method_48336 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;Ljava/util/stream/Stream;)I
ARG 0 source
ARG 1 player
ARG 2 patterns
METHOD method_67080 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
METHOD method_67081 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)I
ARG 0 source
ARG 1 player
METHOD method_67082 execute (Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;Lnet/minecraft/class_5321;)I
ARG 0 source
ARG 1 player
ARG 2 pattern
METHOD method_67083 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 pattern
METHOD method_67084 (Ljava/util/List;Lnet/minecraft/class_6880$class_6883;)V
ARG 1 entry
METHOD method_67085 (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Integer;
ARG 0 material
METHOD method_67086 getArmorItems (Lnet/minecraft/class_7225;)Ljava/util/List;
ARG 0 itemRegistry
METHOD method_67087 (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Integer;
ARG 0 pattern
6 changes: 5 additions & 1 deletion mappings/net/minecraft/server/command/TestCommand.mapping
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
FIELD field_56194 NO_TESTS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_56194 NO_TESTS_TO_CLEAR_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_56195 TEST_INSTANCE_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_56196 EXPORT_STRUCTURES_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_56197 NO_TEST_INSTANCES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_56198 NO_TEST_CONTAINING_POS_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType;
FIELD field_56408 NO_TESTS_TO_RESET_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;
FIELD field_56409 TOO_LARGE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;
METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I
ARG 0 source
ARG 1 variableName
Expand Down Expand Up @@ -156,6 +158,8 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand
ARG 0 context
METHOD method_67044 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_9123;
ARG 0 context
METHOD method_67307 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message;
ARG 0 maxSize
CLASS class_4528 Listener
FIELD comp_2217 tests Lnet/minecraft/class_4524;
METHOD <init> (Lnet/minecraft/class_2168;Lnet/minecraft/class_4524;)V
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/test/TestEntry.mapping
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
CLASS net/minecraft/class_10663 net/minecraft/test/TestEntry
METHOD <init> (Ljava/util/Map;Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V
ARG 1 tests
ARG 2 functionId
ARG 3 function
METHOD <init> (Ljava/util/Map;Lnet/minecraft/class_5321;Ljava/util/function/Consumer;)V
ARG 3 function
METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_10664;Ljava/util/function/Consumer;)V
Expand Down
4 changes: 2 additions & 2 deletions mappings/net/minecraft/test/TestEnvironmentDefinition.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ CLASS net/minecraft/class_10665 net/minecraft/test/TestEnvironmentDefinition
FIELD field_56206 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_67066 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
CLASS class_10671 Raining
CLASS class_10671 Weather
FIELD field_56207 CODEC Lcom/mojang/serialization/MapCodec;
METHOD method_67067 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
CLASS class_10672 Weather
CLASS class_10672 State
FIELD field_56211 CODEC Lcom/mojang/serialization/Codec;
FIELD field_56212 name Ljava/lang/String;
FIELD field_56213 clearDuration I
Expand Down

0 comments on commit 0472c7d

Please sign in to comment.