Skip to content

Commit

Permalink
a couple small things
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shnupbups
Shnupbups committed Feb 16, 2025
1 parent 5c86b56 commit 5a54d9e
Show file tree
Hide file tree
Showing 12 changed files with 100 additions and 29 deletions.
4 changes: 0 additions & 4 deletions mappings/net/minecraft/client/render/model/json/ModelVariant.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
CLASS net/minecraft/class_813 net/minecraft/client/render/model/json/ModelVariant
FIELD comp_3379 location Lnet/minecraft/class_2960;
FIELD comp_3382 weight I
METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_813$class_10803;I)V
ARG 1 location
METHOD comp_3379 location ()Lnet/minecraft/class_2960;
METHOD comp_3382 weight ()I
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
2 changes: 2 additions & 0 deletions mappings/net/minecraft/datafixer/Schemas.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,5 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas
ARG 0 followRange
METHOD method_66036 (Ljava/lang/String;)Ljava/lang/String;
ARG 0 value
METHOD method_67100 (Ljava/lang/String;)Ljava/lang/String;
ARG 0 value
14 changes: 14 additions & 0 deletions mappings/net/minecraft/datafixer/fix/ChunkTicketUnpackPosFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
CLASS net/minecraft/class_10767 net/minecraft/datafixer/fix/ChunkTicketUnpackPosFix
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 outputSchema
METHOD method_67591 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
ARG 0 typed
METHOD method_67592 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 0 dynamic
METHOD method_67593 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 0 dataDynamic
METHOD method_67594 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 0 ticketsDynamic
METHOD method_67595 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 0 ticketDynamic
METHOD method_67596 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 0 chunkPosDynamic
33 changes: 27 additions & 6 deletions mappings/net/minecraft/datafixer/fix/InlineBlockPosFormatFix.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,29 @@
CLASS net/minecraft/class_10768 net/minecraft/datafixer/fix/InlineBlockPosFormatFix
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 outputSchema
METHOD method_67597 (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Ljava/util/List;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
ARG 5 entityTyped
METHOD method_67598 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
ARG 1 decorationTyped
METHOD method_67599 fixPlayerFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 dynamic
METHOD method_67600 getEntityFinder (Ljava/lang/String;)Lcom/mojang/datafixers/OpticFinder;
ARG 1 identifierString
METHOD method_67602 consolidateSleepingPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD method_67604 consolidateBoundPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD method_67606 consolidateAnchorPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD method_67608 consolidateHomePos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
METHOD method_67609 consolidateBlockEntityPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 entityId
METHOD method_67601 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
ARG 1 turtleTyped
METHOD method_67602 fixSleeping (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 dynamic
METHOD method_67603 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
ARG 1 phantomTyped
METHOD method_67604 fixVexFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 dynamic
METHOD method_67605 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
ARG 1 vexTyped
METHOD method_67606 fixPhantomFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 dynamic
METHOD method_67607 (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed;
ARG 1 playerTyped
METHOD method_67608 fixTurtleFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 dynamic
METHOD method_67609 fixDecorationFields (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;
ARG 1 dynamic
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/passive/AllayEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ CLASS net/minecraft/class_7298 net/minecraft/entity/passive/AllayEntity
ARG 2 stack
METHOD method_65349 isLikedBy (Lnet/minecraft/class_1297;)Z
ARG 1 player
METHOD method_67660 setDuplicationCooldown (J)V
ARG 1 duplicationCooldown
CLASS class_7524 VibrationCallback
FIELD field_43190 RANGE I
FIELD field_44597 positionSource Lnet/minecraft/class_5716;
Expand Down
28 changes: 14 additions & 14 deletions mappings/net/minecraft/entity/passive/SheepColors.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ CLASS net/minecraft/class_10777 net/minecraft/entity/passive/SheepColors
FIELD field_56661 TEMPERATE Lnet/minecraft/class_10777$class_10779;
FIELD field_56662 WARM Lnet/minecraft/class_10777$class_10779;
FIELD field_56663 COLD Lnet/minecraft/class_10777$class_10779;
METHOD method_67662 group ()Lnet/minecraft/class_6012$class_6006;
METHOD method_67663 builder (Lnet/minecraft/class_6012;)Lnet/minecraft/class_10777$class_10778;
ARG 0 factory
METHOD method_67662 poolBuilder ()Lnet/minecraft/class_6012$class_6006;
METHOD method_67663 createCombinedSelector (Lnet/minecraft/class_6012;)Lnet/minecraft/class_10777$class_10778;
ARG 0 pool
METHOD method_67664 (Lnet/minecraft/class_6012;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 1 prov
METHOD method_67665 addDefault (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10777$class_10778;
ARG 1 random
METHOD method_67665 createDefaultSelector (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10777$class_10778;
ARG 0 color
METHOD method_67666 (Lnet/minecraft/class_1767;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 1 prov
METHOD method_67667 getType (Lnet/minecraft/class_6880;)Lnet/minecraft/class_10777$class_10779;
ARG 1 random
METHOD method_67667 getSpawnConfig (Lnet/minecraft/class_6880;)Lnet/minecraft/class_10777$class_10779;
ARG 0 biome
METHOD method_67668 getRandomColor (Lnet/minecraft/class_6880;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
METHOD method_67668 select (Lnet/minecraft/class_6880;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 0 biome
ARG 1 seed
METHOD method_67669 addColor (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10777$class_10778;
ARG 1 random
METHOD method_67669 createSingleSelector (Lnet/minecraft/class_1767;)Lnet/minecraft/class_10777$class_10778;
ARG 0 color
CLASS class_10778 Factory
METHOD get init (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 1 seed
CLASS class_10779 Type
CLASS class_10778 ColorSelector
METHOD get (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
ARG 1 random
CLASS class_10779 SpawnConfig
4 changes: 3 additions & 1 deletion mappings/net/minecraft/entity/passive/SheepEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity
ARG 0 color
METHOD method_6631 setColor (Lnet/minecraft/class_1767;)V
ARG 1 color
METHOD method_6632 generateDefaultColor (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1767;
METHOD method_6632 selectSpawnColor (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1767;
ARG 0 world
ARG 1 pos
METHOD method_6633 getColor ()Lnet/minecraft/class_1767;
METHOD method_6634 getRgbColor (Lnet/minecraft/class_1767;)I
ARG 0 dyeColor
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/player/PlayerEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity
ARG 1 testBlock
METHOD method_66696 openTestInstanceBlockScreen (Lnet/minecraft/class_10638;)V
ARG 1 testInstanceBlock
METHOD method_67360 (Lnet/minecraft/class_2487;Lnet/minecraft/class_4208;)V
ARG 1 pos
METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I
ARG 1 recipes
METHOD method_7255 addExperience (I)V
Expand Down
12 changes: 8 additions & 4 deletions mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
FIELD field_47822 VILLAGER_PASSENGER_ATTACHMENT_POS Lnet/minecraft/class_243;
FIELD field_52517 controller Lnet/minecraft/class_9878;
FIELD field_7660 yawFlipped Z
FIELD field_7661 CUSTOM_BLOCK_OFFSET Lnet/minecraft/class_2940;
FIELD field_7661 BLOCK_OFFSET Lnet/minecraft/class_2940;
FIELD field_7664 ADJACENT_RAIL_POSITIONS_BY_SHAPE Ljava/util/Map;
FIELD field_7671 CUSTOM_BLOCK_ID Lnet/minecraft/class_2940;
FIELD field_7671 CUSTOM_BLOCK_STATE Lnet/minecraft/class_2940;
METHOD <init> (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;DDD)V
ARG 1 type
ARG 2 world
Expand Down Expand Up @@ -46,6 +46,9 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
ARG 1 x
ARG 3 y
ARG 5 z
METHOD method_67672 getCustomBlockState ()Ljava/util/Optional;
METHOD method_67673 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2680;)V
ARG 2 state
METHOD method_7504 getMaxSpeed (Lnet/minecraft/class_3218;)D
ARG 1 world
METHOD method_7506 onActivatorRail (IIIZ)V
Expand All @@ -58,7 +61,7 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
METHOD method_7513 moveOnRail (Lnet/minecraft/class_3218;)V
ARG 1 world
METHOD method_7514 getBlockOffset ()I
METHOD method_7515 setCustomBlockOffset (I)V
METHOD method_7515 setBlockOffset (I)V
ARG 1 offset
METHOD method_7517 getDefaultContainedBlock ()Lnet/minecraft/class_2680;
METHOD method_7519 getContainedBlock ()Lnet/minecraft/class_2680;
Expand All @@ -74,4 +77,5 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
METHOD method_7525 applySlowdown (Lnet/minecraft/class_243;)Lnet/minecraft/class_243;
ARG 1 velocity
METHOD method_7526 getDefaultBlockOffset ()I
METHOD method_7527 setCustomBlock (Ljava/util/Optional;)V
METHOD method_7527 setCustomBlockState (Ljava/util/Optional;)V
ARG 1 customBlockState
20 changes: 20 additions & 0 deletions mappings/net/minecraft/nbt/NbtCompound.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,16 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound
ARG 1 key
ARG 2 codec
ARG 3 value
METHOD method_68080 getLong (Ljava/lang/String;J)J
COMMENT {@return the {@code long} associated with {@code key}, or {@code fallback} if there is
COMMENT no number stored with the key}
COMMENT
COMMENT <p>If a non-long numeric value is stored, this will cast the value.
COMMENT
COMMENT @see #putLong(String, long)
COMMENT @see AbstractNbtNumber#longValue()
ARG 1 key
ARG 2 fallback
METHOD method_68081 putNullable (Ljava/lang/String;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)V
ARG 1 key
ARG 2 codec
Expand All @@ -340,6 +350,16 @@ CLASS net/minecraft/class_2487 net/minecraft/nbt/NbtCompound
ARG 1 key
ARG 2 codec
ARG 3 value
METHOD method_68083 getInt (Ljava/lang/String;I)I
COMMENT {@return the {@code int} associated with {@code key}, or {@code fallback} if there is
COMMENT no number stored with the key}
COMMENT
COMMENT <p>If a non-integer numeric value is stored, this will cast the value.
COMMENT
COMMENT @see #putInt(String, int)
COMMENT @see AbstractNbtNumber#intValue()
ARG 1 key
ARG 2 fallback
CLASS 1
METHOD method_53888 scanCompound (Ljava/io/DataInput;Lnet/minecraft/class_6836;Lnet/minecraft/class_2505;)Lnet/minecraft/class_6836$class_6838;
ARG 0 input
Expand Down
7 changes: 7 additions & 0 deletions mappings/net/minecraft/util/math/Direction.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
FIELD field_48449 ID_TO_VALUE_FUNCTION Ljava/util/function/IntFunction;
FIELD field_48450 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_53685 doubleVector Lnet/minecraft/class_243;
FIELD field_57037 BY_ID_CODEC Lcom/mojang/serialization/Codec;
FIELD field_57038 BY_HORIZONTAL_QUARTER_TURNS_CODEC Lcom/mojang/serialization/Codec;
FIELD field_57039 floatVector Lorg/joml/Vector3fc;
METHOD <init> (Ljava/lang/String;IIIILjava/lang/String;Lnet/minecraft/class_2350$class_2352;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_2382;)V
ARG 3 id
ARG 4 idOpposite
Expand Down Expand Up @@ -120,6 +123,10 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
ARG 1 fallback
METHOD method_62675 getVector ()Lnet/minecraft/class_2382;
METHOD method_62676 getDoubleVector ()Lnet/minecraft/class_243;
METHOD method_68070 (Lnet/minecraft/class_2350;)Ljava/lang/Byte;
ARG 0 direction
METHOD method_68071 (Lnet/minecraft/class_2350;)Ljava/lang/Byte;
ARG 0 direction
CLASS class_2351 Axis
FIELD field_11053 name Ljava/lang/String;
FIELD field_23780 VALUES [Lnet/minecraft/class_2350$class_2351;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/village/TradeOffers.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,4 +276,5 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
METHOD comp_1962 typeToFactory ()Ljava/util/Map;
METHOD method_53834 of (Lnet/minecraft/class_3853$class_1652;[Lnet/minecraft/class_5321;)Lnet/minecraft/class_3853$class_8640;
ARG 0 factory
ARG 1 types
CLASS class_8793 EmptyFactory

0 comments on commit 5a54d9e

Please sign in to comment.