diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping index e9494b8436..2daf63b552 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriterionConditions FIELD field_1270 id Lnet/minecraft/class_2960; FIELD field_24381 playerPredicate Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;)V + ARG 1 id + ARG 2 entity METHOD method_27790 getPlayerPredicate ()Lnet/minecraft/class_2048$class_5258; diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index ffd60001de..796d1d09a5 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -48,6 +48,8 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria 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; + FIELD field_38700 ITEM_DELIVERED_TO_PLAYER Lnet/minecraft/class_2135; + FIELD field_38701 ALLAY_DROP_ITEM_ON_BLOCK Lnet/minecraft/class_4711; METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179; ARG 0 id METHOD method_766 getCriteria ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping similarity index 63% rename from mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping index afa248737d..329748620a 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping @@ -1,5 +1,7 @@ -CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion - FIELD field_21576 ID Lnet/minecraft/class_2960; +CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion + FIELD field_21576 id Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_23888 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_4711$class_4712;)Z ARG 4 conditions METHOD method_23889 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V @@ -9,6 +11,11 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemUsedOnBlo CLASS class_4712 Conditions FIELD field_21579 item Lnet/minecraft/class_2073; FIELD field_24495 location Lnet/minecraft/class_2090; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V + ARG 1 id + ARG 2 entity + ARG 3 location + ARG 4 item METHOD method_23892 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z ARG 1 state ARG 2 world @@ -17,3 +24,6 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemUsedOnBlo METHOD method_27981 create (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; ARG 0 location ARG 1 item + METHOD method_43125 createAllayDropItemOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; + ARG 0 location + ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index b5179a1d59..c9f709533a 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -1,7 +1,19 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion - FIELD field_9758 ID Lnet/minecraft/class_2960; + FIELD field_9758 id Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2960;)V + ARG 1 id METHOD method_29964 (Lnet/minecraft/class_2135$class_2137;)Z ARG 0 conditions METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2137 Conditions + METHOD method_43135 createLocation (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2135$class_2137; + ARG 0 entity + METHOD method_43136 createLocation (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_2135$class_2137; + ARG 0 block + ARG 1 item + METHOD method_43137 createLocation (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2135$class_2137; + ARG 0 location + METHOD method_43138 createSleptInBed ()Lnet/minecraft/class_2135$class_2137; + METHOD method_43139 createHeroOfTheVillage ()Lnet/minecraft/class_2135$class_2137; + METHOD method_43140 createItemDeliveredToPlayer ()Lnet/minecraft/class_2135$class_2137; diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping index c1f87f878f..b85d645348 100644 --- a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping +++ b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 0 state ARG 1 direction METHOD method_32775 getDripFluid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611; + ARG 0 world ARG 1 pos METHOD method_32776 getSupportingPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Ljava/util/Optional; ARG 0 world @@ -101,6 +102,8 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock METHOD method_33278 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 pos ARG 2 state + METHOD method_33279 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_5689$class_7381; + ARG 1 pos METHOD method_33281 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_35283 isPointingUp (Lnet/minecraft/class_2680;)Z @@ -133,6 +136,7 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 0 state ARG 1 world ARG 2 pos + ARG 3 random METHOD method_36376 growMerged (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V ARG 0 state ARG 1 world @@ -151,3 +155,4 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock METHOD method_40018 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 pos ARG 2 state + CLASS class_7381 DrippingFluid diff --git a/mappings/net/minecraft/block/SculkSensorBlock.mapping b/mappings/net/minecraft/block/SculkSensorBlock.mapping index 67f680b937..931c350ca4 100644 --- a/mappings/net/minecraft/block/SculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/SculkSensorBlock.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock ARG 0 entity ARG 1 world ARG 2 pos + ARG 3 state ARG 4 power METHOD method_32905 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5704;)V ARG 0 world diff --git a/mappings/net/minecraft/block/SculkShriekerBlock.mapping b/mappings/net/minecraft/block/SculkShriekerBlock.mapping index 1155a301ca..8577dd4e45 100644 --- a/mappings/net/minecraft/block/SculkShriekerBlock.mapping +++ b/mappings/net/minecraft/block/SculkShriekerBlock.mapping @@ -9,3 +9,9 @@ CLASS net/minecraft/class_7268 net/minecraft/block/SculkShriekerBlock ARG 1 pos ARG 2 state ARG 3 blockEntity + METHOD method_43132 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V + ARG 1 blockEntity + METHOD method_43133 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V + ARG 1 blockEntity + METHOD method_43134 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7133;)V + ARG 1 blockEntity diff --git a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping index 377ed0d11b..7cf3d20453 100644 --- a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping @@ -1,9 +1,35 @@ CLASS net/minecraft/class_7133 net/minecraft/block/entity/SculkShriekerBlockEntity FIELD field_38238 RANGE I FIELD field_38239 vibrationListener Lnet/minecraft/class_5718; + FIELD field_38755 WARNING_SOUNDS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_38757 warningLevel I METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state METHOD method_42322 (Lnet/minecraft/class_5718;)V ARG 1 vibrationListener METHOD method_42325 getVibrationListener ()Lnet/minecraft/class_5718; + METHOD method_43141 shriek (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_43142 trySyncWarningLevel (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;)Z + ARG 1 world + ARG 2 state + METHOD method_43143 getClosestPlayerWarningManager (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 0 world + ARG 1 pos + METHOD method_43144 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_7262;)Z + ARG 2 warningManager + METHOD method_43145 (Lnet/minecraft/class_7260;)V + ARG 0 entity + METHOD method_43146 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V + ARG 0 warningSounds + METHOD method_43147 warn (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_43148 trySpawnWarden (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos + METHOD method_43149 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_7262;)Ljava/lang/Boolean; + ARG 2 warningManager + METHOD method_43150 canWarn (Lnet/minecraft/class_3218;)Z + ARG 1 world + METHOD method_43151 playWarningSound ()V diff --git a/mappings/net/minecraft/block/sapling/MangroveSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/MangroveSaplingGenerator.mapping new file mode 100644 index 0000000000..0d9db37c53 --- /dev/null +++ b/mappings/net/minecraft/block/sapling/MangroveSaplingGenerator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7382 net/minecraft/block/sapling/MangroveSaplingGenerator + FIELD field_38758 tallChance F + METHOD (F)V + ARG 1 tallChance diff --git a/mappings/net/minecraft/class_7376.mapping b/mappings/net/minecraft/class_7376.mapping deleted file mode 100644 index b316d9fe25..0000000000 --- a/mappings/net/minecraft/class_7376.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_7376 - METHOD method_22494 toJson ()Lcom/google/gson/JsonObject; - METHOD method_22497 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z diff --git a/mappings/net/minecraft/class_7391.mapping b/mappings/net/minecraft/class_7391.mapping deleted file mode 100644 index 896efa6399..0000000000 --- a/mappings/net/minecraft/class_7391.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_7391 - FIELD field_24449 aimedInterpolator Lnet/minecraft/class_7391$class_5171; - FIELD field_24450 aimlessInterpolator Lnet/minecraft/class_7391$class_5171; - METHOD method_32800 scatter (I)I - COMMENT Scatters a seed by integer overflow in multiplication onto the whole - COMMENT int domain. - ARG 1 seed - CLASS class_5171 AngleInterpolator - FIELD field_23980 value D - FIELD field_23981 speed D - FIELD field_23982 lastUpdateTime J - METHOD method_27190 update (JD)V - ARG 1 time - ARG 3 target - METHOD method_27316 shouldUpdate (J)Z - ARG 1 time diff --git a/mappings/net/minecraft/client/item/CompassAnglePredicateProvider.mapping b/mappings/net/minecraft/client/item/CompassAnglePredicateProvider.mapping new file mode 100644 index 0000000000..ad3087f88a --- /dev/null +++ b/mappings/net/minecraft/client/item/CompassAnglePredicateProvider.mapping @@ -0,0 +1,42 @@ +CLASS net/minecraft/class_7391 net/minecraft/client/item/CompassAnglePredicateProvider + FIELD field_24449 aimedInterpolator Lnet/minecraft/class_7391$class_5171; + FIELD field_24450 aimlessInterpolator Lnet/minecraft/class_7391$class_5171; + FIELD field_38799 compassTarget Lnet/minecraft/class_7391$class_7392; + METHOD (Lnet/minecraft/class_7391$class_7392;)V + ARG 1 compassTarget + METHOD method_32800 scatter (I)I + COMMENT Scatters a seed by integer overflow in multiplication onto the whole + COMMENT int domain. + ARG 1 seed + METHOD method_43212 getAimlessAngle (IJ)F + ARG 1 seed + ARG 2 time + METHOD method_43214 getAngleTo (Lnet/minecraft/class_1297;JLnet/minecraft/class_2338;)F + ARG 1 entity + ARG 2 time + ARG 4 pos + METHOD method_43215 getClientWorld (Lnet/minecraft/class_1297;Lnet/minecraft/class_638;)Lnet/minecraft/class_638; + ARG 1 entity + ARG 2 world + METHOD method_43217 canPointTo (Lnet/minecraft/class_1297;Lnet/minecraft/class_4208;)Z + ARG 1 entity + ARG 2 pos + METHOD method_43218 getAngle (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;ILnet/minecraft/class_1297;)F + ARG 1 stack + ARG 2 world + ARG 3 seed + ARG 4 entity + CLASS class_5171 AngleInterpolator + FIELD field_23980 value D + FIELD field_23981 speed D + FIELD field_23982 lastUpdateTime J + METHOD method_27190 update (JD)V + ARG 1 time + ARG 3 target + METHOD method_27316 shouldUpdate (J)Z + ARG 1 time + CLASS class_7392 CompassTarget + METHOD getPos (Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)Lnet/minecraft/class_4208; + ARG 1 world + ARG 2 stack + ARG 3 entity diff --git a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping index e731861695..3377d1ba1b 100644 --- a/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping +++ b/mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping @@ -105,6 +105,14 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR ARG 3 seed METHOD method_37106 registerCustomModelData (Lnet/minecraft/class_1800;)V ARG 0 provider + METHOD method_43219 (Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)Lnet/minecraft/class_4208; + ARG 0 world + ARG 1 stack + ARG 2 entity + METHOD method_43220 (Lnet/minecraft/class_638;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)Lnet/minecraft/class_4208; + ARG 0 world + ARG 1 stack + ARG 2 entity CLASS 1 FIELD field_7910 step D FIELD field_7911 time D diff --git a/mappings/net/minecraft/data/server/CatVariantTagProvider.mapping b/mappings/net/minecraft/data/server/CatVariantTagProvider.mapping new file mode 100644 index 0000000000..87a9d51cf7 --- /dev/null +++ b/mappings/net/minecraft/data/server/CatVariantTagProvider.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7393 net/minecraft/data/server/CatVariantTagProvider + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 dataGenerator diff --git a/mappings/net/minecraft/datafixer/Schemas.mapping b/mappings/net/minecraft/datafixer/Schemas.mapping index d2cf6a77d6..9afa34e1ce 100644 --- a/mappings/net/minecraft/datafixer/Schemas.mapping +++ b/mappings/net/minecraft/datafixer/Schemas.mapping @@ -15,3 +15,7 @@ CLASS net/minecraft/class_3551 net/minecraft/datafixer/Schemas ARG 0 replacements METHOD method_30071 (Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String; ARG 1 string + METHOD method_43061 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V + ARG 0 frogVariants + METHOD method_43062 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V + ARG 0 catVariants diff --git a/mappings/net/minecraft/datafixer/fix/EntityVariantTypeFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityVariantTypeFix.mapping new file mode 100644 index 0000000000..7ab095fdcb --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityVariantTypeFix.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_7371 net/minecraft/datafixer/fix/EntityVariantTypeFix + FIELD field_38705 variantKey Ljava/lang/String; + FIELD field_38706 variantIntToId Ljava/util/function/IntFunction; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/IntFunction;)V + ARG 1 schema + ARG 2 name + ARG 4 entityId + ARG 5 variantKey + ARG 6 variantIntToId diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index a9636a592e..2279da2955 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -19,6 +19,9 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_17207 VILLAGER_DATA Lnet/minecraft/class_2941; FIELD field_17910 OPTIONAL_INT Lnet/minecraft/class_2941; FIELD field_18238 ENTITY_POSE Lnet/minecraft/class_2941; + FIELD field_38825 OPTIONAL_GLOBAL_POS Lnet/minecraft/class_2941; + FIELD field_38826 CAT_VARIANT Lnet/minecraft/class_2941; + FIELD field_38827 FROG_VARIANT Lnet/minecraft/class_2941; METHOD method_12719 getId (Lnet/minecraft/class_2941;)I ARG 0 handler METHOD method_12720 register (Lnet/minecraft/class_2941;)V diff --git a/mappings/net/minecraft/entity/mob/Angriness.mapping b/mappings/net/minecraft/entity/mob/Angriness.mapping index a1b56dfd62..ad03b1a858 100644 --- a/mappings/net/minecraft/entity/mob/Angriness.mapping +++ b/mappings/net/minecraft/entity/mob/Angriness.mapping @@ -2,9 +2,11 @@ CLASS net/minecraft/class_7253 net/minecraft/entity/mob/Angriness FIELD field_38123 VALUES [Lnet/minecraft/class_7253; FIELD field_38124 threshold I FIELD field_38125 sound Lnet/minecraft/class_3414; + FIELD field_38732 listeningSound Lnet/minecraft/class_3414; METHOD (Ljava/lang/String;IILnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 3 threshold ARG 4 sound + ARG 5 listeningSound METHOD method_42170 getThreshold ()I METHOD method_42171 getForAnger (I)Lnet/minecraft/class_7253; ARG 0 anger @@ -14,3 +16,4 @@ CLASS net/minecraft/class_7253 net/minecraft/entity/mob/Angriness METHOD method_42173 ([Lnet/minecraft/class_7253;)V ARG 0 values METHOD method_42174 getSound ()Lnet/minecraft/class_3414; + METHOD method_43103 getListeningSound ()Lnet/minecraft/class_3414; diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index 3cfcbd1620..2163da447b 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity METHOD method_42205 addDigParticles (Lnet/minecraft/class_7094;)V ARG 1 animationState METHOD method_42206 isValidTarget (Lnet/minecraft/class_1297;)Z + ARG 1 entity METHOD method_42207 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Ljava/lang/Boolean; ARG 1 suspect METHOD method_42208 (Lnet/minecraft/class_7254;)V @@ -26,7 +27,9 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity METHOD method_42211 removeSuspect (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_42212 increaseAngerAt (Lnet/minecraft/class_1297;IZ)V + ARG 1 entity ARG 2 amount + ARG 3 listening METHOD method_42213 increaseAngerAt (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_42214 getAngriness ()Lnet/minecraft/class_7253; @@ -41,3 +44,4 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity METHOD method_42222 getAnger ()I METHOD method_42223 getEarPitch (F)F ARG 1 tickDelta + METHOD method_43113 isDiggingOrEmerging ()Z diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 1fc2878991..9ddd633da1 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity FIELD field_6808 fleeGoal Lnet/minecraft/class_1451$class_3698; FIELD field_6809 TAMING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_6810 temptGoal Lnet/minecraft/class_1391; - FIELD field_6811 CAT_TYPE Lnet/minecraft/class_2940; + FIELD field_6811 CAT_VARIANT Lnet/minecraft/class_2940; METHOD method_16082 getSleepAnimation (F)F ARG 1 tickDelta METHOD method_16084 updateHeadDownAnimation ()V @@ -41,8 +41,9 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity METHOD method_16096 getCollarColor ()Lnet/minecraft/class_1767; METHOD method_22327 getAttackDamage ()F METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_6571 getCatType ()Lnet/minecraft/class_7375; - METHOD method_6572 setCatType (Lnet/minecraft/class_7375;)V + METHOD method_6571 getVariant ()Lnet/minecraft/class_7375; + METHOD method_6572 setVariant (Lnet/minecraft/class_7375;)V + ARG 1 variant CLASS class_3698 CatFleeGoal FIELD field_16293 cat Lnet/minecraft/class_1451; METHOD (Lnet/minecraft/class_1451;Ljava/lang/Class;FDD)V diff --git a/mappings/net/minecraft/entity/passive/CatVariant.mapping b/mappings/net/minecraft/entity/passive/CatVariant.mapping new file mode 100644 index 0000000000..0496904db7 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/CatVariant.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7375 net/minecraft/entity/passive/CatVariant + METHOD method_43090 register (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7375; + ARG 0 id + ARG 1 textureId diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index 2101a1786e..13548fdb75 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity FIELD field_37456 idlingInWaterAnimationState Lnet/minecraft/class_7094; FIELD field_37457 VARIANT Lnet/minecraft/class_2940; FIELD field_37458 TARGET Lnet/minecraft/class_2940; + FIELD field_38720 VARIANT_KEY Ljava/lang/String; METHOD method_41352 setFrogTarget (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_41353 setVariant (Lnet/minecraft/class_7106;)V @@ -18,7 +19,7 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity METHOD method_41355 createFrogAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_41356 shouldWalk ()Z METHOD method_41357 shouldSwim ()Z - METHOD method_41358 isValidFrogTarget (Lnet/minecraft/class_1309;)Z + METHOD method_41358 isValidFrogFood (Lnet/minecraft/class_1309;)Z ARG 0 entity METHOD method_41359 clearFrogTarget ()V METHOD method_41360 getFrogTarget ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/passive/FrogVariant.mapping b/mappings/net/minecraft/entity/passive/FrogVariant.mapping new file mode 100644 index 0000000000..fb1b854127 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/FrogVariant.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7106 net/minecraft/entity/passive/FrogVariant + METHOD method_43091 register (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_7106; + ARG 0 id + ARG 1 textureId diff --git a/mappings/net/minecraft/entity/passive/Variant.mapping b/mappings/net/minecraft/entity/passive/Variant.mapping deleted file mode 100644 index cd1d9568cf..0000000000 --- a/mappings/net/minecraft/entity/passive/Variant.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_7106 net/minecraft/entity/passive/Variant diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 7fb0e5cd8e..4c9810b316 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_19428 shoulderEntityAddedTime J FIELD field_30642 OFFLINE_PLAYER_UUID_PREFIX Ljava/lang/String; FIELD field_38198 sculkShriekerWarningManager Lnet/minecraft/class_7262; + FIELD field_38745 LAST_DEATH_POS Lnet/minecraft/class_2940; FIELD field_7483 strideDistance F FIELD field_7484 itemCooldownManager Lnet/minecraft/class_1796; FIELD field_7486 enderChestInventory Lnet/minecraft/class_1730; @@ -112,6 +113,9 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_40126 useRiptide (I)V ARG 1 riptideTicks METHOD method_42272 getSculkShriekerWarningManager ()Lnet/minecraft/class_7262; + METHOD method_43120 setLastDeathPos (Ljava/util/Optional;)V + ARG 1 lastDeathPos + METHOD method_43122 getLastDeathPos ()Ljava/util/Optional; METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/item/CompassItem.mapping b/mappings/net/minecraft/item/CompassItem.mapping index e5332c102a..e7cfc996e2 100644 --- a/mappings/net/minecraft/item/CompassItem.mapping +++ b/mappings/net/minecraft/item/CompassItem.mapping @@ -11,3 +11,7 @@ CLASS net/minecraft/class_1759 net/minecraft/item/CompassItem ARG 1 worldKey ARG 2 pos ARG 3 nbt + METHOD method_43123 createSpawnPos (Lnet/minecraft/class_1937;)Lnet/minecraft/class_4208; + ARG 0 world + METHOD method_43124 createLodestonePos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4208; + ARG 0 nbt diff --git a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping index 1c5f46e831..02d7c36928 100644 --- a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookPredicate - FIELD field_23137 ANY Lnet/minecraft/class_4965; + FIELD field_23137 ALL Lnet/minecraft/class_4965; FIELD field_23138 inOpenWater Z FIELD field_30854 IN_OPEN_WATER Ljava/lang/String; METHOD (Z)V ARG 1 inOpenWater METHOD method_26094 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4965; + ARG 0 json METHOD method_26095 of (Z)Lnet/minecraft/class_4965; ARG 0 inOpenWater diff --git a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping new file mode 100644 index 0000000000..6bf431bff2 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7383 net/minecraft/predicate/entity/SlimePredicate + FIELD field_38759 size Lnet/minecraft/class_2096$class_2100; + METHOD (Lnet/minecraft/class_2096$class_2100;)V + ARG 1 size + METHOD method_43157 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_7383; + ARG 0 size + METHOD method_43158 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7383; + ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping new file mode 100644 index 0000000000..c52ac5bee4 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredicate + FIELD field_38723 ANY Lnet/minecraft/class_7376; + METHOD method_22494 toJson ()Lcom/google/gson/JsonObject; + METHOD method_22497 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z + ARG 1 entity + ARG 2 world + ARG 3 pos + METHOD method_43095 cat (Lnet/minecraft/class_7375;)Lnet/minecraft/class_7376; + ARG 0 variant + METHOD method_43096 frog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376; + ARG 0 variant + METHOD method_43097 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_7376; + ARG 0 json + METHOD method_43099 getDeserializer ()Lnet/minecraft/class_7376$class_7377; + CLASS class_7377 Deserializer + CLASS class_7378 Deserializers + FIELD field_38724 ANY Lnet/minecraft/class_7376$class_7377; + FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_7377; + FIELD field_38726 FISHING_HOOK Lnet/minecraft/class_7376$class_7377; + FIELD field_38727 PLAYER Lnet/minecraft/class_7376$class_7377; + FIELD field_38728 SLIME Lnet/minecraft/class_7376$class_7377; + FIELD field_38729 CAT Lnet/minecraft/class_7380; + FIELD field_38730 FROG Lnet/minecraft/class_7380; + FIELD field_38731 TYPES Lcom/google/common/collect/BiMap; + METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity + METHOD method_43101 (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; + ARG 0 json + METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; + ARG 0 entity diff --git a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping new file mode 100644 index 0000000000..e48d4febe0 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates + FIELD field_38739 VARIANT_KEY Ljava/lang/String; + FIELD field_38740 registry Lnet/minecraft/class_2378; + FIELD field_38741 variantGetter Ljava/util/function/Function; + FIELD field_38742 deserializer Lnet/minecraft/class_7376$class_7377; + METHOD (Lnet/minecraft/class_2378;Ljava/util/function/Function;)V + ARG 1 registry + ARG 2 variantGetter + METHOD method_43114 getDeserializer ()Lnet/minecraft/class_7376$class_7377; + METHOD method_43115 (Lnet/minecraft/class_2378;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; + ARG 2 json + METHOD method_43116 create (Lnet/minecraft/class_2378;Ljava/util/function/Function;)Lnet/minecraft/class_7380; + ARG 0 registry + ARG 1 variantGetter + METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7376; + ARG 1 variant diff --git a/mappings/net/minecraft/tag/CatVariantTags.mapping b/mappings/net/minecraft/tag/CatVariantTags.mapping new file mode 100644 index 0000000000..c6ed3a5d38 --- /dev/null +++ b/mappings/net/minecraft/tag/CatVariantTags.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7369 net/minecraft/tag/CatVariantTags + METHOD method_43046 of (Ljava/lang/String;)Lnet/minecraft/class_6862; + ARG 0 id diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 080138a53b..886fd98237 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -150,6 +150,12 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_37230 DENSITY_FUNCTION_TYPE Lnet/minecraft/class_2378; FIELD field_37997 COMMAND_ARGUMENT_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_38000 COMMAND_ARGUMENT_TYPE Lnet/minecraft/class_2378; + FIELD field_38802 CAT_VARIANT_KEY Lnet/minecraft/class_5321; + FIELD field_38803 CAT_VARIANT Lnet/minecraft/class_2378; + FIELD field_38804 FROG_VARIANT_KEY Lnet/minecraft/class_5321; + FIELD field_38805 FROG_VARIANT Lnet/minecraft/class_2378; + FIELD field_38806 ROOT_PLACER_TYPE_KEY Lnet/minecraft/class_5321; + FIELD field_38807 ROOT_PLACER_TYPE Lnet/minecraft/class_2378; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;)V ARG 1 key ARG 2 lifecycle @@ -405,6 +411,12 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry METHOD method_40294 createEntryCodec ()Lcom/mojang/serialization/Codec; METHOD method_40295 getIndexedEntries ()Lnet/minecraft/class_2359; METHOD method_42021 getKeys ()Ljava/util/Set; + METHOD method_43223 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7106; + ARG 0 registry + METHOD method_43224 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7375; + ARG 0 registry + METHOD method_43225 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_7388; + ARG 0 registry CLASS 1 METHOD method_40296 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_6880; ARG 0 entry diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 9f0544ee8c..30294ac923 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -144,6 +144,24 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World ARG 5 notify METHOD method_41411 shouldTickBlockPos (Lnet/minecraft/class_2338;)Z ARG 1 pos + METHOD method_43126 getSpawnPos ()Lnet/minecraft/class_2338; + METHOD method_43127 getSpawnAngle ()F + METHOD method_43128 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V + ARG 1 player + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 sound + ARG 9 category + ARG 10 volume + ARG 11 pitch + METHOD method_43129 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V + ARG 1 player + ARG 2 entity + ARG 3 sound + ARG 4 category + ARG 5 volume + ARG 6 pitch METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState diff --git a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping index b9672e88e8..ca48a6c6e1 100644 --- a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping +++ b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping @@ -29,3 +29,7 @@ CLASS net/minecraft/class_5715 net/minecraft/world/event/listener/EntityGameEven ARG 1 world METHOD method_42336 (Lnet/minecraft/class_3218;Lnet/minecraft/class_4076;)V ARG 2 sectionPos + METHOD method_43152 getListener ()Lnet/minecraft/class_5714; + METHOD method_43153 setListener (Lnet/minecraft/class_5714;Lnet/minecraft/class_1937;)V + ARG 1 listener + ARG 2 world diff --git a/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping index eb5f4bf780..bbabf91a91 100644 --- a/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/DiskFeature.mapping @@ -1 +1,12 @@ CLASS net/minecraft/class_3011 net/minecraft/world/gen/feature/DiskFeature + METHOD method_43159 getSandstone (Lnet/minecraft/class_6577;)Lnet/minecraft/class_2680; + ARG 1 config + METHOD method_43160 placeBlock (Lnet/minecraft/class_6577;Lnet/minecraft/class_5281;IILnet/minecraft/class_2338$class_2339;)Z + ARG 1 config + ARG 2 world + ARG 3 topY + ARG 4 bottomY + ARG 5 pos + METHOD method_43161 anyTargetsMatch (Lnet/minecraft/class_6577;Lnet/minecraft/class_2680;)Z + ARG 1 config + ARG 2 state diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 0643be7a45..0e4b7d97e5 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -51,4 +51,5 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature ARG 1 config ARG 2 world ARG 3 chunkGenerator + ARG 4 random ARG 5 pos diff --git a/mappings/net/minecraft/world/gen/feature/SimpleDiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/SimpleDiskFeature.mapping new file mode 100644 index 0000000000..b69a33ac21 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/SimpleDiskFeature.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5433 net/minecraft/world/gen/feature/SimpleDiskFeature diff --git a/mappings/net/minecraft/world/gen/feature/SurfaceDiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/SurfaceDiskFeature.mapping new file mode 100644 index 0000000000..e4216f03e8 --- /dev/null +++ b/mappings/net/minecraft/world/gen/feature/SurfaceDiskFeature.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7385 net/minecraft/world/gen/feature/SurfaceDiskFeature diff --git a/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping index 9369e29f57..531d3fdbce 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeConfiguredFeatures.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/class_6808 net/minecraft/world/gen/feature/TreeConfiguredFea FIELD field_35922 OAK_BEES_0002 Lnet/minecraft/class_6880; FIELD field_35923 OAK_BEES_002 Lnet/minecraft/class_6880; FIELD field_35924 OAK_BEES_005 Lnet/minecraft/class_6880; + FIELD field_38810 MANGROVE Lnet/minecraft/class_6880; + FIELD field_38811 TALL_MANGROVE Lnet/minecraft/class_6880; METHOD method_39710 oak ()Lnet/minecraft/class_4643$class_4644; METHOD method_39711 builder (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;IIII)Lnet/minecraft/class_4643$class_4644; ARG 0 log diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping index 068f32fdfe..fbb6aeba0f 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeature.mapping @@ -6,7 +6,12 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature ARG 2 state METHOD method_12775 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4643;)Z ARG 1 world + ARG 2 random ARG 3 pos + ARG 4 rootPlacerReplacer + ARG 5 trunkPlacerReplacer + ARG 6 foliagePlacerReplacer + ARG 7 config METHOD method_16416 isVine (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos @@ -30,6 +35,8 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature ARG 1 box ARG 2 trunkPositions ARG 3 decorationPositions + METHOD method_23381 (Lnet/minecraft/class_5281;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_4662;)V + ARG 6 decorator METHOD method_23384 (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z @@ -53,3 +60,6 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature METHOD method_35366 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 2 pos ARG 3 state + METHOD method_43162 (Ljava/util/Set;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 2 pos + ARG 3 state diff --git a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping index 4054c549e7..8c431528f7 100644 --- a/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping @@ -9,11 +9,18 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_29279 dirtProvider Lnet/minecraft/class_4651; FIELD field_29280 foliageProvider Lnet/minecraft/class_4651; FIELD field_29281 forceDirt Z + FIELD field_38767 rootPlacer Ljava/util/Optional; METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Ljava/util/Optional;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V ARG 1 trunkProvider ARG 2 trunkPlacer ARG 3 foliageProvider ARG 4 foliagePlacer + ARG 5 rootPlacer + ARG 6 dirtProvider + ARG 7 minimumSize + ARG 8 decorators + ARG 9 ignoreVines + ARG 10 forceDirt METHOD method_28811 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_28814 (Lnet/minecraft/class_4643;)Lnet/minecraft/class_5201; @@ -34,6 +41,8 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig ARG 0 config METHOD method_37261 (Lnet/minecraft/class_4643;)Ljava/lang/Boolean; ARG 0 config + METHOD method_43164 (Lnet/minecraft/class_4643;)Ljava/util/Optional; + ARG 0 config CLASS class_4644 Builder FIELD field_21292 trunkProvider Lnet/minecraft/class_4651; FIELD field_21294 decorators Ljava/util/List; @@ -44,6 +53,14 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig FIELD field_29282 foliageProvider Lnet/minecraft/class_4651; FIELD field_29283 dirtProvider Lnet/minecraft/class_4651; FIELD field_29284 forceDirt Z + FIELD field_38768 rootPlacer Ljava/util/Optional; + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Ljava/util/Optional;Lnet/minecraft/class_5201;)V + ARG 1 trunkProvider + ARG 2 trunkPlacer + ARG 3 foliageProvider + ARG 4 foliagePlacer + ARG 5 rootPlacer + ARG 6 minimumSize METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_5201;)V ARG 1 trunkProvider ARG 2 trunkPlacer diff --git a/mappings/net/minecraft/world/gen/feature/UnderwaterDiskFeature.mapping b/mappings/net/minecraft/world/gen/feature/UnderwaterDiskFeature.mapping deleted file mode 100644 index 94f5314d51..0000000000 --- a/mappings/net/minecraft/world/gen/feature/UnderwaterDiskFeature.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5433 net/minecraft/world/gen/feature/UnderwaterDiskFeature diff --git a/mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping b/mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping new file mode 100644 index 0000000000..06760e86d8 --- /dev/null +++ b/mappings/net/minecraft/world/gen/root/MangroveRootPlacer.mapping @@ -0,0 +1,52 @@ +CLASS net/minecraft/class_7386 net/minecraft/world/gen/root/MangroveRootPlacer + FIELD field_38771 CODEC Lcom/mojang/serialization/Codec; + FIELD field_38772 canGrowThrough Lnet/minecraft/class_6885; + FIELD field_38773 muddyRootsIn Lnet/minecraft/class_6885; + FIELD field_38774 muddyRootsProvider Lnet/minecraft/class_4651; + FIELD field_38775 maxRootWidth I + FIELD field_38776 maxRootLength I + FIELD field_38777 yOffset Lnet/minecraft/class_6017; + FIELD field_38778 randomSkewChance F + METHOD (Lnet/minecraft/class_4651;Lnet/minecraft/class_6885;Lnet/minecraft/class_6885;Lnet/minecraft/class_4651;IILnet/minecraft/class_6017;F)V + ARG 1 rootProvider + ARG 2 canGrowThrough + ARG 3 muddyRootsIn + ARG 4 muddyRootsProvider + ARG 5 maxRootWidth + ARG 6 maxRootLength + ARG 7 yOffset + ARG 8 randomSkewChance + METHOD method_43166 canGrow (Lnet/minecraft/class_3746;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Ljava/util/List;I)Z + ARG 1 world + ARG 2 random + ARG 3 pos + ARG 4 direction + ARG 5 origin + ARG 6 offshootPositions + ARG 7 rootLength + METHOD method_43167 canGrowThrough (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_43169 (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_43170 (Lnet/minecraft/class_7386;)Ljava/lang/Float; + ARG 0 rootPlacer + METHOD method_43171 getOffshootPositions (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/List; + ARG 1 pos + ARG 2 direction + ARG 3 random + ARG 4 origin + METHOD method_43174 (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_43175 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_6017; + ARG 0 rootPlacer + METHOD method_43176 (Lnet/minecraft/class_7386;)Ljava/lang/Integer; + ARG 0 rootPlacer + METHOD method_43177 (Lnet/minecraft/class_7386;)Ljava/lang/Integer; + ARG 0 rootPlacer + METHOD method_43178 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_4651; + ARG 0 rootPlacer + METHOD method_43179 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_6885; + ARG 0 rootPlacer + METHOD method_43180 (Lnet/minecraft/class_7386;)Lnet/minecraft/class_6885; + ARG 0 rootPlacer diff --git a/mappings/net/minecraft/world/gen/root/RootPlacer.mapping b/mappings/net/minecraft/world/gen/root/RootPlacer.mapping new file mode 100644 index 0000000000..2274c6a3cb --- /dev/null +++ b/mappings/net/minecraft/world/gen/root/RootPlacer.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/class_7387 net/minecraft/world/gen/root/RootPlacer + FIELD field_38779 TYPE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_38780 rootProvider Lnet/minecraft/class_4651; + METHOD (Lnet/minecraft/class_4651;)V + ARG 1 rootProvider + METHOD method_43165 getType ()Lnet/minecraft/class_7388; + METHOD method_43168 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Ljava/util/Optional; + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 pos + ARG 5 config + METHOD method_43172 placeRoots (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 pos + ARG 5 config + METHOD method_43181 applyWaterlogging (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; + ARG 1 world + ARG 2 pos + ARG 3 state + METHOD method_43183 (Lnet/minecraft/class_7387;)Lnet/minecraft/class_4651; + ARG 0 rootPlacer + METHOD method_43184 (Lnet/minecraft/class_3610;)Z + ARG 0 fluidState diff --git a/mappings/net/minecraft/world/gen/root/RootPlacerType.mapping b/mappings/net/minecraft/world/gen/root/RootPlacerType.mapping new file mode 100644 index 0000000000..f7ec1ebea6 --- /dev/null +++ b/mappings/net/minecraft/world/gen/root/RootPlacerType.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_7388 net/minecraft/world/gen/root/RootPlacerType + FIELD field_38782 codec Lcom/mojang/serialization/Codec; + METHOD (Lcom/mojang/serialization/Codec;)V + ARG 1 codec + METHOD method_43185 getCodec ()Lcom/mojang/serialization/Codec; + METHOD method_43186 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_7388; + ARG 0 id + ARG 1 codec diff --git a/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping index f3d8d3a070..1c891a1400 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping @@ -10,10 +10,12 @@ CLASS net/minecraft/class_4658 net/minecraft/world/gen/treedecorator/AlterGround METHOD method_23462 setArea (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 replacer + ARG 3 random ARG 4 pos METHOD method_23463 setColumn (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 replacer + ARG 3 random ARG 4 pos METHOD method_28889 (Lnet/minecraft/class_4658;)Lnet/minecraft/class_4651; ARG 0 decorator diff --git a/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping new file mode 100644 index 0000000000..05c10eccfc --- /dev/null +++ b/mappings/net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_7389 net/minecraft/world/gen/treedecorator/AttachedToLeavesTreeDecorator + FIELD field_38783 CODEC Lcom/mojang/serialization/Codec; + FIELD field_38784 probability F + FIELD field_38785 exclusionRadiusXZ I + FIELD field_38786 exclusionRadiusY I + FIELD field_38787 blockProvider Lnet/minecraft/class_4651; + FIELD field_38788 requiredEmptyBlocks I + FIELD field_38789 directions Ljava/util/List; + METHOD (FIILnet/minecraft/class_4651;ILjava/util/List;)V + ARG 1 probability + ARG 2 exclusionRadiusXZ + ARG 3 exclusionRadiusY + ARG 4 blockProvider + ARG 5 requiredEmptyBlocks + ARG 6 directions + METHOD method_43187 meetsRequiredEmptyBlocks (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z + ARG 1 world + ARG 2 pos + ARG 3 direction + METHOD method_43189 (Lnet/minecraft/class_7389;)Ljava/util/List; + ARG 0 treeDecorator + METHOD method_43190 (Lnet/minecraft/class_7389;)Ljava/lang/Integer; + ARG 0 treeDecorator + METHOD method_43191 (Lnet/minecraft/class_7389;)Lnet/minecraft/class_4651; + ARG 0 treeDecorator + METHOD method_43192 (Lnet/minecraft/class_7389;)Ljava/lang/Integer; + ARG 0 treeDecorator + METHOD method_43193 (Lnet/minecraft/class_7389;)Ljava/lang/Integer; + ARG 0 treeDecorator + METHOD method_43194 (Lnet/minecraft/class_7389;)Ljava/lang/Float; + ARG 0 treeDecorator diff --git a/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping index 5402d0e525..41b3e297e0 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping @@ -1,8 +1,15 @@ CLASS net/minecraft/class_4661 net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator FIELD field_24960 CODEC Lcom/mojang/serialization/Codec; + FIELD field_38790 probability F + METHOD (F)V + ARG 1 probability METHOD method_23467 placeVines (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/function/BiConsumer;)V COMMENT Places a vine at a given position and then up to 4 more vines going downwards. ARG 0 world ARG 1 pos ARG 2 facing ARG 3 replacer + METHOD method_23468 (Lnet/minecraft/class_5819;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V + ARG 4 pos + METHOD method_43195 (Lnet/minecraft/class_4661;)Ljava/lang/Float; + ARG 0 treeDecorator diff --git a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping index 645e5adfa2..0098a6f392 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorat METHOD method_23469 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V ARG 1 world ARG 2 replacer + ARG 3 random ARG 4 logPositions ARG 5 leavesPositions METHOD method_23471 placeVine (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;)V diff --git a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping index 6d5299df25..589dfc9405 100644 --- a/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping +++ b/mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping @@ -13,17 +13,30 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer COMMENT Generates the trunk blocks and return a list of tree nodes to place foliage around ARG 1 world ARG 2 replacer + ARG 3 random ARG 4 height ARG 5 startPos ARG 6 config METHOD method_26993 getHeight (Lnet/minecraft/class_5819;)I + ARG 1 random METHOD method_27400 setToDirt (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V ARG 0 world ARG 1 replacer + ARG 2 random ARG 3 pos ARG 4 config METHOD method_27401 trySetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;)V + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 pos + ARG 5 config METHOD method_27402 getAndSetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;Ljava/util/function/Function;)Z + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 pos + ARG 5 config METHOD method_27403 canGenerate (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos @@ -39,3 +52,16 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer METHOD method_28907 (Lnet/minecraft/class_5141;)Ljava/lang/Integer; ARG 0 placer METHOD method_35375 getAndSetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Z + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 pos + ARG 5 config + METHOD method_43196 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_43197 (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_43198 canReplaceOrIsLog (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer.mapping b/mappings/net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer.mapping new file mode 100644 index 0000000000..5df71d6e8f --- /dev/null +++ b/mappings/net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/class_7390 net/minecraft/world/gen/trunk/UpwardsBranchingTrunkPlacer + FIELD field_38793 CODEC Lcom/mojang/serialization/Codec; + FIELD field_38794 extraBranchSteps Lnet/minecraft/class_6017; + FIELD field_38795 placeBranchPerLogProbability F + FIELD field_38796 extraBranchLength Lnet/minecraft/class_6017; + FIELD field_38797 canGrowThrough Lnet/minecraft/class_6885; + METHOD (IIILnet/minecraft/class_6017;FLnet/minecraft/class_6017;Lnet/minecraft/class_6885;)V + ARG 1 baseHeight + ARG 2 firstRandomHeight + ARG 3 secondRandomHeight + ARG 4 extraBranchSteps + ARG 5 placeBranchPerLogProbability + ARG 6 extraBranchLength + ARG 7 canGrowThrough + METHOD method_43199 generateExtraBranch (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;ILnet/minecraft/class_4643;Ljava/util/List;Lnet/minecraft/class_2338$class_2339;ILnet/minecraft/class_2350;II)V + ARG 1 world + ARG 2 replacer + ARG 3 random + ARG 4 height + ARG 5 config + ARG 6 nodes + ARG 7 pos + ARG 8 yOffset + ARG 9 direction + ARG 10 length + ARG 11 steps + METHOD method_43200 (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_43201 (Lnet/minecraft/class_7390;)Lnet/minecraft/class_6885; + ARG 0 trunkPlacer + METHOD method_43203 (Lnet/minecraft/class_7390;)Lnet/minecraft/class_6017; + ARG 0 trunkPlacer + METHOD method_43204 (Lnet/minecraft/class_7390;)Ljava/lang/Float; + ARG 0 trunkPlacer + METHOD method_43205 (Lnet/minecraft/class_7390;)Lnet/minecraft/class_6017; + ARG 0 trunkPlacer