mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

22w13a misc stuff (#3073) 

* 22w13a stuff

* Update StringIdentifiable.mapping

* Fix several mapping bugs
Resolves #3043
Resolves #3057
Resolves #3066
This commit is contained in:
apple502j 2022-04-07 01:05:01 +09:00 committed by GitHub
parent 424de6e072
commit 7930e597e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 99 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mappings/net/minecraft/advancement/criterion/Criteria.mapping
View File

@ -47,6 +47,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria
FIELD field_33872 USING_ITEM Lnet/minecraft/class_6409;
FIELD field_35013 FALL_FROM_HEIGHT Lnet/minecraft/class_2108;
FIELD field_35014 RIDE_ENTITY_IN_LAVA Lnet/minecraft/class_2108;
FIELD field_38376 KILL_MOB_NEAR_SCULK_CATALYST Lnet/minecraft/class_2080;
METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179;
ARG 0 id
METHOD method_766 getCriteria ()Ljava/lang/Iterable;

1
mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping
View File

@ -43,6 +43,7 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite
METHOD method_35256 createEntityKilledPlayer (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083;
ARG 0 killerEntityPredicate
ARG 1 damageSourcePredicate
METHOD method_42671 createKillMobNearSculkCatalyst ()Lnet/minecraft/class_2080$class_2083;
METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083;
ARG 0 killedEntityPredicateBuilder
METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_2080$class_2083;

6
mappings/net/minecraft/block/AbstractRailBlock.mapping
View File

@ -1,10 +1,10 @@
CLASS net/minecraft/class_2241 net/minecraft/block/AbstractRailBlock
FIELD field_27096 WATERLOGGED Lnet/minecraft/class_2746;
FIELD field_9958 STRAIGHT_SHAPE Lnet/minecraft/class_265;
FIELD field_9959 allowCurves Z
FIELD field_9959 forbidCurves Z
FIELD field_9960 ASCENDING_SHAPE Lnet/minecraft/class_265;
METHOD <init> (ZLnet/minecraft/class_4970$class_2251;)V
ARG 1 allowCurves
ARG 1 forbidCurves
ARG 2 settings
METHOD method_24417 updateCurves (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)Lnet/minecraft/class_2680;
ARG 1 state
@ -33,7 +33,7 @@ CLASS net/minecraft/class_2241 net/minecraft/block/AbstractRailBlock
ARG 2 world
ARG 3 pos
ARG 4 neighbor
METHOD method_9478 canMakeCurves ()Z
METHOD method_9478 cannotMakeCurves ()Z
METHOD method_9479 isRail (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos

2
mappings/net/minecraft/block/RailPlacementHelper.mapping
View File

@ -1,7 +1,7 @@
CLASS net/minecraft/class_2452 net/minecraft/block/RailPlacementHelper
FIELD field_11406 state Lnet/minecraft/class_2680;
FIELD field_11407 neighbors Ljava/util/List;
FIELD field_11408 allowCurves Z
FIELD field_11408 forbidCurves Z
FIELD field_11409 world Lnet/minecraft/class_1937;
FIELD field_11410 pos Lnet/minecraft/class_2338;
FIELD field_11411 block Lnet/minecraft/class_2241;

4
mappings/net/minecraft/block/dispenser/BoatDispenserBehavior.mapping
View File

@ -1,5 +1,9 @@
CLASS net/minecraft/class_2967 net/minecraft/block/dispenser/BoatDispenserBehavior
FIELD field_13360 itemDispenser Lnet/minecraft/class_2347;
FIELD field_13361 boatType Lnet/minecraft/class_1690$class_1692;
FIELD field_38465 chest Z
METHOD <init> (Lnet/minecraft/class_1690$class_1692;)V
ARG 1 type
METHOD <init> (Lnet/minecraft/class_1690$class_1692;Z)V
ARG 1 boatType
ARG 2 chest

4
mappings/net/minecraft/data/server/AdventureTabAdvancementGenerator.mapping
View File

@ -7,9 +7,9 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/AdventureTabAdvancement
METHOD accept (Ljava/lang/Object;)V
ARG 1 exporter
METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
ARG 1 task
ARG 1 builder
METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162;
ARG 0 task
ARG 0 builder
ARG 1 biomes
METHOD method_37315 createLookingAtEntityUsing (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)Lnet/minecraft/class_6409$class_6410;
ARG 0 entity

3
mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping
View File

@ -8,6 +8,7 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator
FIELD field_11342 WITH_SILK_TOUCH_OR_SHEARS Lnet/minecraft/class_5341$class_210;
FIELD field_11343 WITH_SHEARS Lnet/minecraft/class_5341$class_210;
FIELD field_16493 lootTables Ljava/util/Map;
FIELD field_38468 LEAVES_STICK_DROP_CHANCE [F
METHOD accept (Ljava/lang/Object;)V
ARG 1 exporter
METHOD method_10371 grassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
@ -299,3 +300,5 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator
ARG 0 ore
METHOD method_37108 glowLichenDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 0 glowLichen
METHOD method_42752 mangroveLeavesDrop (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 0 leaves

10
mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping
View File

@ -4,17 +4,19 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancement
FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792;
FIELD field_11298 FOOD_ITEMS [Lnet/minecraft/class_1792;
FIELD field_33964 AXE_ITEMS [Lnet/minecraft/class_1792;
FIELD field_38467 EGG_LAYING_ANIMALS [Lnet/minecraft/class_1299;
METHOD accept (Ljava/lang/Object;)V
ARG 1 exporter
METHOD method_10339 requireListedFishCaught (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
ARG 1 task
ARG 1 builder
METHOD method_10340 requireListedFishBucketsFilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
ARG 1 task
ARG 1 builder
METHOD method_10341 requireFoodItemsEaten (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
ARG 1 task
ARG 1 builder
METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
ARG 1 builder
METHOD method_16117 (Lnet/minecraft/class_161$class_162;Ljava/lang/Integer;Lnet/minecraft/class_2960;)V
ARG 1 type
ARG 2 id
METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
ARG 1 task
ARG 1 builder

4
mappings/net/minecraft/data/server/RecipeProvider.mapping
View File

@ -334,3 +334,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
METHOD method_36547 createCutCopperRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447;
ARG 0 output
ARG 1 input
METHOD method_42754 offerChestBoatRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
ARG 0 exporter
ARG 1 output
ARG 2 input

10
mappings/net/minecraft/entity/ai/brain/task/FrogEatEntityTask.mapping
View File

@ -1,12 +1,22 @@
CLASS net/minecraft/class_7108 net/minecraft/entity/ai/brain/task/FrogEatEntityTask
FIELD field_37479 RUN_TIME I
FIELD field_37480 EAT_DURATION I
FIELD field_37481 MAX_DISTANCE F
FIELD field_37482 VELOCITY_MULTIPLIER F
FIELD field_37483 eatTick I
FIELD field_37484 moveToTargetTick I
FIELD field_37485 tongueSound Lnet/minecraft/class_3414;
FIELD field_37486 eatSound Lnet/minecraft/class_3414;
FIELD field_37487 targetPos Lnet/minecraft/class_243;
FIELD field_37489 phase Lnet/minecraft/class_7108$class_7109;
FIELD field_38414 CATCH_DURATION I
METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
ARG 1 tongueSound
ARG 2 eatSound
METHOD method_41386 createDroppedStack (Lnet/minecraft/class_7102;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1799;
ARG 0 frog
ARG 1 eatenEntity
METHOD method_42667 eat (Lnet/minecraft/class_3218;Lnet/minecraft/class_7102;)V
ARG 1 world
ARG 2 frog
CLASS class_7109 Phase

4
mappings/net/minecraft/entity/ai/brain/task/WalkToNearestVisibleWantedItemTask.mapping
View File

@ -13,3 +13,7 @@ CLASS net/minecraft/class_4815 net/minecraft/entity/ai/brain/task/WalkToNearestV
ARG 4 radius
METHOD method_24580 getNearestVisibleWantedItem (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1542;
ARG 1 entity
METHOD method_24581 (Lnet/minecraft/class_1309;)Z
ARG 0 entity
METHOD method_42652 isInPickupCooldown (Lnet/minecraft/class_1309;)Z
ARG 1 entity

2
mappings/net/minecraft/entity/mob/MobEntity.mapping
View File

@ -27,6 +27,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
COMMENT
COMMENT @see MobEntity#initEquipment
FIELD field_34043 DEFAULT_DROP_CHANCE F
FIELD field_38386 ITEM_PICK_UP_RANGE_EXPANDER Lnet/minecraft/class_2382;
FIELD field_6184 lootTableSeed J
FIELD field_6185 targetSelector Lnet/minecraft/class_1355;
COMMENT Contains goals used to select this entity's target.
@ -139,6 +140,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
ARG 0 stack
METHOD method_42150 isInAttackRange (Lnet/minecraft/class_1309;)Z
ARG 1 entity
METHOD method_42646 getItemPickUpRangeExpander ()Lnet/minecraft/class_2382;
METHOD method_5929 getDropChance (Lnet/minecraft/class_1304;)F
ARG 1 slot
METHOD method_5930 setForwardSpeed (F)V

3
mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping
View File

@ -31,7 +31,8 @@ CLASS net/minecraft/class_1688 net/minecraft/entity/vehicle/AbstractMinecartEnti
ARG 0 map
METHOD method_30340 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
ARG 1 pos
METHOD method_7504 getMaxOffRailSpeed ()D
METHOD method_42670 getItem ()Lnet/minecraft/class_1792;
METHOD method_7504 getMaxSpeed ()D
METHOD method_7505 snapPositionToRailWithOffset (DDDD)Lnet/minecraft/class_243;
COMMENT This method is used to determine the minecart's render orientation, by computing a position along the rail slightly before and slightly after the minecart's actual position.
ARG 1 x

7
mappings/net/minecraft/particle/ParticleTypes.mapping
View File

@ -3,3 +3,10 @@ CLASS net/minecraft/class_2398 net/minecraft/particle/ParticleTypes
METHOD method_10303 register (Ljava/lang/String;Z)Lnet/minecraft/class_2400;
ARG 0 name
ARG 1 alwaysShow
METHOD method_42022 register (Ljava/lang/String;ZLnet/minecraft/class_2394$class_2395;Ljava/util/function/Function;)Lnet/minecraft/class_2396;
ARG 0 name
ARG 1 alwaysShow
ARG 2 factory
ARG 3 codecGetter
METHOD method_42616 (Lnet/minecraft/class_2396;)Lcom/mojang/serialization/Codec;
ARG 0 type

4
mappings/net/minecraft/test/TestContext.mapping
View File

@ -313,3 +313,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext
ARG 1 heightmap
ARG 2 x
ARG 3 z
METHOD method_42762 dontExpectItemAt (Lnet/minecraft/class_1792;Lnet/minecraft/class_2338;D)V
ARG 1 item
ARG 2 pos
ARG 3 radius

6
mappings/net/minecraft/util/Arm.mapping
View File

@ -1,3 +1,7 @@
CLASS net/minecraft/class_1306 net/minecraft/util/Arm
FIELD field_6181 optionName Ljava/lang/String;
FIELD field_38385 id I
FIELD field_6181 translationKey Ljava/lang/String;
METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
ARG 3 id
ARG 4 translationKey
METHOD method_5928 getOpposite ()Lnet/minecraft/class_1306;

32
mappings/net/minecraft/util/StringIdentifiable.mapping
View File

@ -7,3 +7,35 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable
ARG 0 enumValues
METHOD method_28142 toKeyable ([Lnet/minecraft/class_3542;)Lcom/mojang/serialization/Keyable;
ARG 0 values
METHOD method_39516 (Ljava/lang/Object;)Ljava/lang/String;
ARG 0 identifiable
METHOD method_42628 (Ljava/lang/Enum;)Ljava/lang/Enum;
ARG 0 enum_
METHOD method_42629 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Enum;
ARG 1 id
METHOD method_42630 ([Ljava/lang/Enum;Ljava/lang/String;)Ljava/lang/Enum;
ARG 1 id
CLASS 1
METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
ARG 1 ops
CLASS class_7292 Codec
FIELD field_38378 base Lcom/mojang/serialization/Codec;
FIELD field_38379 idToIdentifiable Ljava/util/function/Function;
METHOD <init> ([Ljava/lang/Enum;Ljava/util/function/Function;)V
ARG 1 values
ARG 2 idToIdentifiable
METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
ARG 1 ops
ARG 2 input
METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
ARG 1 input
ARG 2 ops
ARG 3 prefix
METHOD method_42632 (Ljava/lang/Object;)I
ARG 0 enum_
METHOD method_42633 byId (Ljava/lang/String;)Ljava/lang/Enum;
ARG 1 id
METHOD method_42634 ([Ljava/lang/Enum;I)Ljava/lang/Enum;
ARG 1 ordinal
METHOD method_42635 (Ljava/lang/Object;)Ljava/lang/String;
ARG 0 identifiable

2
mappings/net/minecraft/util/math/MathHelper.mapping
View File

@ -429,3 +429,5 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
ARG 0 seed
ARG 1 lowerBound
ARG 2 upperBound
METHOD method_42626 magnitude (F)F
ARG 0 n

2
mappings/net/minecraft/util/registry/RegistryEntry.mapping
View File

@ -3,7 +3,7 @@ CLASS net/minecraft/class_6880 net/minecraft/util/registry/RegistryEntry
ARG 1 tag
METHOD method_40221 upcast (Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880;
ARG 0 entry
METHOD method_40222 setRegistry (Lnet/minecraft/class_2378;)Z
METHOD method_40222 matchesRegistry (Lnet/minecraft/class_2378;)Z
ARG 1 registry
METHOD method_40223 of (Ljava/lang/Object;)Lnet/minecraft/class_6880;
ARG 0 value

4
mappings/net/minecraft/world/MobSpawnerLogic.mapping
View File

@ -24,8 +24,12 @@ CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic
METHOD method_8273 sendStatus (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V
ARG 1 world
ARG 2 pos
ARG 3 status
METHOD method_8274 setEntityId (Lnet/minecraft/class_1299;)V
ARG 1 type
METHOD method_8275 handleStatus (Lnet/minecraft/class_1937;I)Z
ARG 1 world
ARG 2 status
METHOD method_8277 setSpawnEntry (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1952;)V
ARG 1 world
ARG 2 pos

1
mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping
View File

@ -67,6 +67,7 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis
METHOD method_42324 canAccept (Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;)Z
ARG 1 gameEvent
ARG 2 entity
METHOD method_42672 onListen ()V
CLASS class_7269 Vibration
FIELD field_38245 CODEC Lcom/mojang/serialization/Codec;
METHOD <init> (Lnet/minecraft/class_5712;ILnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V