From 42acd4afaed3f34c5a053ba5226a866144850098 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 12 Apr 2022 00:39:36 +1000 Subject: [PATCH] 22w14a stuff 2: electric boogaloo (#3085) * 22w14a stuff 2: electric boogaloo * Update mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../minecraft/client/model/ModelPart.mapping | 1 + .../feature/WardenFeatureRenderer.mapping | 13 +++++++++++ .../entity/model/EntityModelPartNames.mapping | 10 ++++++++ .../entity/model/WardenEntityModel.mapping | 23 +++++++++++++++++++ .../server/EntityLootTableGenerator.mapping | 3 +++ .../entity/ai/WardenAngerManager.mapping | 20 +++++++++++++++- .../GiveInventoryToLookTargetTask.mapping | 6 +++++ .../minecraft/entity/mob/WardenEntity.mapping | 2 +- .../entity/passive/AllayBrain.mapping | 4 ++++ .../entity/passive/CatEntity.mapping | 4 ++++ .../predicate/entity/EntityPredicate.mapping | 12 +++++++++- .../{ => entity}/PlayerPredicate.mapping | 3 ++- .../entity/TypeSpecificPredicate.mapping | 3 ++- .../entity/VariantPredicates.mapping | 3 +++ .../world/biome/OverworldBiomeCreator.mapping | 1 + .../listener/EntityGameEventHandler.mapping | 4 ++++ .../listener/GameEventDispatcher.mapping | 1 + .../SimpleGameEventDispatcher.mapping | 10 ++++++++ .../gen/feature/DefaultBiomeFeatures.mapping | 4 ++++ .../gen/feature/DiskFeatureConfig.mapping | 2 ++ .../world/gen/feature/EndSpikeFeature.mapping | 1 + .../gen/feature/HugeFungusFeature.mapping | 10 ++++++-- .../feature/HugeFungusFeatureConfig.mapping | 10 ++++++++ .../gen/feature/HugeMushroomFeature.mapping | 3 +++ .../feature/MiscConfiguredFeatures.mapping | 1 + .../gen/feature/MiscPlacedFeatures.mapping | 1 + ...mapping => MultifaceGrowthFeature.mapping} | 2 +- ...g => MultifaceGrowthFeatureConfig.mapping} | 2 +- .../gen/feature/SmallDripstoneFeature.mapping | 2 ++ .../gen/feature/TreePlacedFeatures.mapping | 2 ++ .../gen/feature/TwistingVinesFeature.mapping | 1 + .../UndergroundConfiguredFeatures.mapping | 3 ++- .../feature/UndergroundPlacedFeatures.mapping | 3 ++- .../VegetationConfiguredFeatures.mapping | 1 + .../feature/VegetationPatchFeature.mapping | 2 ++ .../feature/VegetationPlacedFeatures.mapping | 1 + .../gen/feature/WeepingVinesFeature.mapping | 3 +++ .../gen/treedecorator/TreeDecorator.mapping | 1 + unpick-definitions/cat_types.unpick | 18 --------------- unpick-definitions/entity_model_parts.unpick | 5 ++++ 40 files changed, 172 insertions(+), 29 deletions(-) rename mappings/net/minecraft/predicate/{ => entity}/PlayerPredicate.mapping (97%) rename mappings/net/minecraft/world/gen/feature/{GlowLichenFeature.mapping => MultifaceGrowthFeature.mapping} (89%) rename mappings/net/minecraft/world/gen/feature/{GlowLichenFeatureConfig.mapping => MultifaceGrowthFeatureConfig.mapping} (94%) delete mode 100644 unpick-definitions/cat_types.unpick diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 482026f05d..9fe1424c94 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart FIELD field_37939 yScale F FIELD field_37940 zScale F FIELD field_37941 defaultTransform Lnet/minecraft/class_5603; + FIELD field_38456 hidden Z METHOD (Ljava/util/List;Ljava/util/Map;)V ARG 1 cuboids ARG 2 children diff --git a/mappings/net/minecraft/client/render/entity/feature/WardenFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/WardenFeatureRenderer.mapping index c9261bb493..83f9eb676c 100644 --- a/mappings/net/minecraft/client/render/entity/feature/WardenFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/WardenFeatureRenderer.mapping @@ -1,12 +1,25 @@ CLASS net/minecraft/class_7288 net/minecraft/client/render/entity/feature/WardenFeatureRenderer FIELD field_38355 texture Lnet/minecraft/class_2960; FIELD field_38356 animationAngleAdjuster Lnet/minecraft/class_7288$class_7289; + FIELD field_38464 modelPartVisibility Lnet/minecraft/class_7288$class_7311; METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_2960;Lnet/minecraft/class_7288$class_7289;Lnet/minecraft/class_7288$class_7311;)V ARG 1 context ARG 2 texture ARG 3 animationAngleAdjuster + ARG 4 modelPartVisibility + METHOD method_42746 updateModelPartVisibility ()V + METHOD method_42747 (Lnet/minecraft/class_630;)V + ARG 0 part + METHOD method_42748 unhideAllModelParts ()V + METHOD method_42749 (Lnet/minecraft/class_630;)V + ARG 0 part + METHOD method_42750 (Lnet/minecraft/class_630;)V + ARG 0 part CLASS class_7289 AnimationAngleAdjuster METHOD apply (Lnet/minecraft/class_7260;FF)F ARG 1 warden ARG 2 tickDelta ARG 3 animationProgress + CLASS class_7311 ModelPartVisibility + METHOD getPartsToDraw (Lnet/minecraft/class_583;)Ljava/util/List; + ARG 1 model diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping index 68845b6c47..1be9c9e56b 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping @@ -132,3 +132,13 @@ CLASS net/minecraft/class_6230 net/minecraft/client/render/entity/model/EntityMo COMMENT The key of a right foot model part, whose value is {@value}. FIELD field_37950 EYES Ljava/lang/String; COMMENT The key of an eyes model part, whose value is {@value}. + FIELD field_38329 RIGHT_TENDRIL Ljava/lang/String; + COMMENT The key of a right tendril model part, whose value is {@value}. + FIELD field_38330 LEFT_TENDRIL Ljava/lang/String; + COMMENT The key of a left tendril model part, whose value is {@value}. + FIELD field_38331 BONE Ljava/lang/String; + COMMENT The key of a bone model part, whose value is {@value}. + FIELD field_38457 RIGHT_RIBCAGE Ljava/lang/String; + COMMENT The key of a right ribcage model part, whose value is {@value}. + FIELD field_38458 LEFT_RIBCAGE Ljava/lang/String; + COMMENT The key of a left ribcage model part, whose value is {@value}. diff --git a/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping index a41e876682..afaaa6d6e8 100644 --- a/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/WardenEntityModel.mapping @@ -9,6 +9,12 @@ CLASS net/minecraft/class_7280 net/minecraft/client/render/entity/model/WardenEn FIELD field_38322 rightArm Lnet/minecraft/class_630; FIELD field_38323 rightLeg Lnet/minecraft/class_630; FIELD field_38327 root Lnet/minecraft/class_630; + FIELD field_38449 leftRibcage Lnet/minecraft/class_630; + FIELD field_38450 rightRibcage Lnet/minecraft/class_630; + FIELD field_38451 tendrils Ljava/util/List; + FIELD field_38452 justBody Ljava/util/List; + FIELD field_38453 headAndLimbs Ljava/util/List; + FIELD field_38454 bodyHeadAndLimbs Ljava/util/List; METHOD (Lnet/minecraft/class_630;)V ARG 1 root METHOD method_42578 getTexturedModelData ()Lnet/minecraft/class_5607; @@ -18,3 +24,20 @@ CLASS net/minecraft/class_7280 net/minecraft/client/render/entity/model/WardenEn ARG 3 time METHOD method_42581 (Lnet/minecraft/class_7184;JLnet/minecraft/class_7094;)V ARG 4 state + METHOD method_42734 setHeadAndBodyAngles (F)V + ARG 1 animationProgress + METHOD method_42735 setHeadAngle (FF)V + ARG 1 yaw + ARG 2 pitch + METHOD method_42736 setTendrilPitches (Lnet/minecraft/class_7260;FF)V + ARG 1 warden + ARG 2 animationProgress + ARG 3 tickDelta + METHOD method_42737 setLimbAngles (FF)V + ARG 1 angle + ARG 2 distance + METHOD method_42738 getTendrils ()Ljava/util/List; + METHOD method_42739 getBody ()Ljava/util/List; + METHOD method_42740 getHeadAndLimbs ()Ljava/util/List; + METHOD method_42741 getBodyHeadAndLimbs ()Ljava/util/List; + METHOD method_42742 setArmPivots ()V diff --git a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping index 420f6c9699..c3d2e3ff81 100644 --- a/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/EntityLootTableGenerator.mapping @@ -12,3 +12,6 @@ CLASS net/minecraft/class_2434 net/minecraft/data/server/EntityLootTableGenerato METHOD method_16369 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_52$class_53;)V ARG 1 entityId ARG 2 lootTable + METHOD method_43226 killedByFrog ()Lnet/minecraft/class_5341$class_210; + METHOD method_43227 killedByFrog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_5341$class_210; + ARG 1 variant diff --git a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping index 6af25a8dd7..1f72b16dd5 100644 --- a/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping +++ b/mappings/net/minecraft/entity/ai/WardenAngerManager.mapping @@ -2,9 +2,18 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager FIELD field_38127 CODEC Lcom/mojang/serialization/Codec; FIELD field_38128 maxAnger I FIELD field_38129 angerDecreasePerTick I - FIELD field_38130 suspects Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_38130 suspectsToAngerLevel Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_38734 suspects Ljava/util/SortedSet; + FIELD field_38735 suspectUuidsToAngerLevel Lit/unimi/dsi/fastutil/objects/Object2IntMap; + FIELD field_38736 updateTimer I + FIELD field_38737 SUSPECT_CODEC Lcom/mojang/serialization/Codec; + METHOD (Ljava/util/List;)V + ARG 1 suspects METHOD method_42176 tick (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;)V + ARG 1 world + ARG 2 suspectPredicate METHOD method_42177 (ILnet/minecraft/class_1297;Ljava/lang/Integer;)Ljava/lang/Integer; + ARG 1 suspect ARG 2 anger METHOD method_42178 removeSuspect (Lnet/minecraft/class_1297;)V ARG 1 entity @@ -20,3 +29,12 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager METHOD method_42187 getPrimeSuspect ()Lnet/minecraft/class_1297; METHOD method_42188 (Lnet/minecraft/class_1297;)Z ARG 0 suspect + METHOD method_43104 updateSuspectsMap (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_43108 getSuspects ()Ljava/util/List; + METHOD method_43109 (Lnet/minecraft/class_1297;)Lcom/mojang/datafixers/util/Pair; + ARG 1 suspect + CLASS class_7379 SuspectComparator + METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I + ARG 1 first + ARG 2 second diff --git a/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping index f5152e6362..1cf332ecf2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GiveInventoryToLookTargetTask.mapping @@ -10,3 +10,9 @@ CLASS net/minecraft/class_7296 net/minecraft/entity/ai/brain/task/GiveInventoryT ARG 2 target METHOD method_42651 offsetTarget (Lnet/minecraft/class_4115;)Lnet/minecraft/class_243; ARG 0 target + METHOD method_43079 triggerCriterion (Lnet/minecraft/class_4115;Lnet/minecraft/class_1799;Lnet/minecraft/class_3222;)V + ARG 1 target + ARG 2 stack + ARG 3 player + METHOD method_43080 (Lnet/minecraft/class_4115;Lnet/minecraft/class_1799;Lnet/minecraft/class_3222;)V + ARG 3 player diff --git a/mappings/net/minecraft/entity/mob/WardenEntity.mapping b/mappings/net/minecraft/entity/mob/WardenEntity.mapping index 2163da447b..279db29a50 100644 --- a/mappings/net/minecraft/entity/mob/WardenEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WardenEntity.mapping @@ -42,6 +42,6 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity ARG 0 entity METHOD method_42221 addAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_42222 getAnger ()I - METHOD method_42223 getEarPitch (F)F + METHOD method_42223 getTendrilPitch (F)F ARG 1 tickDelta METHOD method_43113 isDiggingOrEmerging ()Z diff --git a/mappings/net/minecraft/entity/passive/AllayBrain.mapping b/mappings/net/minecraft/entity/passive/AllayBrain.mapping index b27185f7b4..1ee9c754e7 100644 --- a/mappings/net/minecraft/entity/passive/AllayBrain.mapping +++ b/mappings/net/minecraft/entity/passive/AllayBrain.mapping @@ -16,6 +16,10 @@ CLASS net/minecraft/class_7299 net/minecraft/entity/passive/AllayBrain ARG 0 allay METHOD method_42663 addCoreActivities (Lnet/minecraft/class_4095;)V ARG 0 brain + METHOD method_42664 (Lnet/minecraft/class_7298;)Z + ARG 0 allay + METHOD method_42665 (Lnet/minecraft/class_1309;)Z + ARG 0 allay METHOD method_42666 addIdleActivities (Lnet/minecraft/class_4095;)V ARG 0 brain METHOD method_43092 (Lnet/minecraft/class_3222;)Lnet/minecraft/class_4115; diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 9ddd633da1..c290eb9e35 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -41,6 +41,10 @@ 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_43088 (Lnet/minecraft/class_6880;)V + ARG 1 variant + METHOD method_43089 (Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional; + ARG 1 list METHOD method_6571 getVariant ()Lnet/minecraft/class_7375; METHOD method_6572 setVariant (Lnet/minecraft/class_7375;)V ARG 1 variant diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index ab64c36203..e6018036fd 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_24489 targetedEntity Lnet/minecraft/class_2048; FIELD field_33912 steppingOn Lnet/minecraft/class_2090; FIELD field_33914 passenger Lnet/minecraft/class_2048; + FIELD field_38721 typeSpecific Lnet/minecraft/class_7376; FIELD field_9594 effects Lnet/minecraft/class_2102; FIELD field_9595 type Lnet/minecraft/class_2050; FIELD field_9596 location Lnet/minecraft/class_2090; @@ -21,6 +22,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 6 nbt ARG 7 flags ARG 8 equipment + ARG 9 typeSpecific + ARG 10 team METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_7376;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;)V ARG 1 type ARG 2 distance @@ -30,7 +33,11 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 6 nbt ARG 7 flags ARG 8 equipment - ARG 12 vehicle + ARG 9 typeSpecific + ARG 10 vehicle + ARG 11 passenger + ARG 12 targetedEntity + ARG 13 team METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 0 player ARG 1 target @@ -53,6 +60,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_24491 targetedEntity Lnet/minecraft/class_2048; FIELD field_33915 steppingOn Lnet/minecraft/class_2090; FIELD field_33917 passenger Lnet/minecraft/class_2048; + FIELD field_38722 typeSpecific Lnet/minecraft/class_7376; FIELD field_9602 distance Lnet/minecraft/class_2025; FIELD field_9603 nbt Lnet/minecraft/class_2105; FIELD field_9604 location Lnet/minecraft/class_2090; @@ -71,6 +79,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 passenger METHOD method_37230 steppingOn (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2048$class_2049; ARG 1 location + METHOD method_43094 typeSpecific (Lnet/minecraft/class_7376;)Lnet/minecraft/class_2048$class_2049; + ARG 1 typeSpecific METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049; ARG 1 nbt METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049; diff --git a/mappings/net/minecraft/predicate/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping similarity index 97% rename from mappings/net/minecraft/predicate/PlayerPredicate.mapping rename to mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping index 683db9cc7a..8df8a2d494 100644 --- a/mappings/net/minecraft/predicate/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate +CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate FIELD field_20723 experienceLevel Lnet/minecraft/class_2096$class_2100; FIELD field_20724 gameMode Lnet/minecraft/class_1934; FIELD field_20725 stats Ljava/util/Map; @@ -22,6 +22,7 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate METHOD method_22498 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_3445;Lnet/minecraft/class_2096$class_2100;)V ARG 1 stat METHOD method_22499 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4553; + ARG 0 json METHOD method_22500 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)V ARG 1 id METHOD method_22501 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Lnet/minecraft/class_4553$class_4556;)V diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index c52ac5bee4..0ece469115 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -1,6 +1,6 @@ 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_22494 typeSpecificToJson ()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 @@ -11,6 +11,7 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic ARG 0 variant METHOD method_43097 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_7376; ARG 0 json + METHOD method_43098 toJson ()Lcom/google/gson/JsonElement; METHOD method_43099 getDeserializer ()Lnet/minecraft/class_7376$class_7377; CLASS class_7377 Deserializer CLASS class_7378 Deserializers diff --git a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping index e48d4febe0..fdc98ad63e 100644 --- a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping @@ -14,3 +14,6 @@ CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates ARG 1 variantGetter METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7376; ARG 1 variant + CLASS 1 + METHOD method_43118 (Ljava/lang/Object;Ljava/lang/Object;)Z + ARG 1 variant diff --git a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping index cf8593e720..8399085421 100644 --- a/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping +++ b/mappings/net/minecraft/world/biome/OverworldBiomeCreator.mapping @@ -84,3 +84,4 @@ CLASS net/minecraft/class_5478 net/minecraft/world/biome/OverworldBiomeCreator METHOD method_39153 addBasicFeatures (Lnet/minecraft/class_5485$class_5495;)V ARG 0 generationSettings METHOD method_42061 createDeepDark ()Lnet/minecraft/class_1959; + METHOD method_43232 createMangroveSwamp ()Lnet/minecraft/class_1959; diff --git a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping index ca48a6c6e1..bc852df636 100644 --- a/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping +++ b/mappings/net/minecraft/world/event/listener/EntityGameEventHandler.mapping @@ -33,3 +33,7 @@ CLASS net/minecraft/class_5715 net/minecraft/world/event/listener/EntityGameEven METHOD method_43153 setListener (Lnet/minecraft/class_5714;Lnet/minecraft/class_1937;)V ARG 1 listener ARG 2 world + METHOD method_43154 (Lnet/minecraft/class_5714;Lnet/minecraft/class_5713;)V + ARG 1 dispatcher + METHOD method_43155 (Lnet/minecraft/class_5714;Lnet/minecraft/class_5713;)V + ARG 1 dispatcher diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping index d5aef2634d..cd99f57791 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT the event ARG 2 entity COMMENT an entity related to the event + ARG 3 pos METHOD method_32944 addListener (Lnet/minecraft/class_5714;)V COMMENT Adds a listener to this dispatcher. ARG 1 listener diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index acd866f4e6..0ebac52e51 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -5,4 +5,14 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven COMMENT @apiNote Vanilla Minecraft creates it on a per-chunk-section basis. FIELD field_28142 listeners Ljava/util/List; FIELD field_28143 world Lnet/minecraft/class_3218; + FIELD field_37673 toRemove Ljava/util/Set; + FIELD field_37674 toAdd Ljava/util/List; + FIELD field_37675 dispatching Z + METHOD (Lnet/minecraft/class_3218;)V + ARG 1 world METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_5712;Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Z + ARG 0 world + ARG 1 event + ARG 2 entity + ARG 3 pos + ARG 4 listener diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index c0b5647609..0a58ba9abf 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -181,3 +181,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_42042 addSculk (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder + METHOD method_43230 addMangroveSwampFeatures (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder + METHOD method_43231 addGrassAndClayDisks (Lnet/minecraft/class_5485$class_5495;)V + ARG 0 builder diff --git a/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping index ecf210337b..21d2b306c9 100644 --- a/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/DiskFeatureConfig.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_6577 net/minecraft/world/gen/feature/DiskFeatureConfig METHOD comp_81 radius ()Lnet/minecraft/class_6017; METHOD comp_82 halfHeight ()I METHOD comp_83 targets ()Ljava/util/List; + METHOD method_43163 (Lnet/minecraft/class_6577;)Lnet/minecraft/class_6885; + ARG 0 config diff --git a/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping index 1a9c2c859c..e2f97dae6b 100644 --- a/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_3310 net/minecraft/world/gen/feature/EndSpikeFeature ARG 0 world METHOD method_15888 generateSpike (Lnet/minecraft/class_5425;Lnet/minecraft/class_5819;Lnet/minecraft/class_3666;Lnet/minecraft/class_3310$class_3181;)V ARG 1 world + ARG 2 random ARG 3 config ARG 4 spike CLASS class_3181 Spike diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping index e6a626fffe..a7cc94354f 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature - METHOD method_24439 generateHatBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338$class_2339;FFF)V + METHOD method_24439 placeHatBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338$class_2339;FFF)V ARG 1 world + ARG 2 random ARG 3 config ARG 4 pos ARG 5 decorationChance @@ -8,19 +9,24 @@ CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature ARG 7 vineChance METHOD method_24440 generateStem (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V ARG 1 world + ARG 2 random ARG 3 config ARG 4 pos ARG 5 stemHeight ARG 6 thickStem - METHOD method_24441 tryGenerateVines (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V + METHOD method_24441 placeWithOptionalVines (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V ARG 1 world + ARG 2 random ARG 3 pos ARG 4 state + ARG 5 vines METHOD method_24442 generateVines (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;)V ARG 0 pos ARG 1 world + ARG 2 random METHOD method_24443 generateHat (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V ARG 1 world + ARG 2 random ARG 3 config ARG 4 pos ARG 5 hatHeight diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping index 1023c2f926..dfaf91b91a 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping @@ -11,5 +11,15 @@ CLASS net/minecraft/class_4780 net/minecraft/world/gen/feature/HugeFungusFeature ARG 3 hatState ARG 4 decorationState ARG 5 planted + METHOD method_28630 (Lnet/minecraft/class_4780;)Ljava/lang/Boolean; + ARG 0 config METHOD method_28631 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_28632 (Lnet/minecraft/class_4780;)Lnet/minecraft/class_2680; + ARG 0 config + METHOD method_28633 (Lnet/minecraft/class_4780;)Lnet/minecraft/class_2680; + ARG 0 config + METHOD method_28634 (Lnet/minecraft/class_4780;)Lnet/minecraft/class_2680; + ARG 0 config + METHOD method_28635 (Lnet/minecraft/class_4780;)Lnet/minecraft/class_2680; + ARG 0 config diff --git a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping index 9d21ecebe8..f2f62f2114 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping @@ -10,14 +10,17 @@ CLASS net/minecraft/class_4625 net/minecraft/world/gen/feature/HugeMushroomFeatu ARG 5 config METHOD method_23375 generateCap (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4635;)V ARG 1 world + ARG 2 random ARG 3 start ARG 4 y ARG 5 mutable ARG 6 config METHOD method_23376 generateStem (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4635;ILnet/minecraft/class_2338$class_2339;)V ARG 1 world + ARG 2 random ARG 3 pos ARG 4 config ARG 5 height ARG 6 mutablePos METHOD method_23377 getHeight (Lnet/minecraft/class_5819;)I + ARG 1 random diff --git a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping index efe8d5583e..e9e118325b 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscConfiguredFeatures.mapping @@ -16,3 +16,4 @@ CLASS net/minecraft/class_6804 net/minecraft/world/gen/feature/MiscConfiguredFea FIELD field_35814 SPRING_LAVA_OVERWORLD Lnet/minecraft/class_6880; FIELD field_35815 SPRING_LAVA_FROZEN Lnet/minecraft/class_6880; FIELD field_35816 SPRING_WATER Lnet/minecraft/class_6880; + FIELD field_38809 DISK_GRASS Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping index 92ddad1fdc..7fc1d0ec68 100644 --- a/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/MiscPlacedFeatures.mapping @@ -16,3 +16,4 @@ CLASS net/minecraft/class_6814 net/minecraft/world/gen/feature/MiscPlacedFeature FIELD field_36015 SPRING_LAVA Lnet/minecraft/class_6880; FIELD field_36016 SPRING_LAVA_FROZEN Lnet/minecraft/class_6880; FIELD field_36017 SPRING_WATER Lnet/minecraft/class_6880; + FIELD field_38813 DISK_GRASS Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/GlowLichenFeature.mapping b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping similarity index 89% rename from mappings/net/minecraft/world/gen/feature/GlowLichenFeature.mapping rename to mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping index 00512b4efc..4dcda1737d 100644 --- a/mappings/net/minecraft/world/gen/feature/GlowLichenFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeature.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5779 net/minecraft/world/gen/feature/GlowLichenFeature +CLASS net/minecraft/class_5779 net/minecraft/world/gen/feature/MultifaceGrowthFeature METHOD method_33391 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5780;Lnet/minecraft/class_5819;Ljava/util/List;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/feature/GlowLichenFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping similarity index 94% rename from mappings/net/minecraft/world/gen/feature/GlowLichenFeatureConfig.mapping rename to mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping index a4372cc9b5..5242437b7f 100644 --- a/mappings/net/minecraft/world/gen/feature/GlowLichenFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5780 net/minecraft/world/gen/feature/GlowLichenFeatureConfig +CLASS net/minecraft/class_5780 net/minecraft/world/gen/feature/MultifaceGrowthFeatureConfig FIELD field_28429 CODEC Lcom/mojang/serialization/Codec; FIELD field_28430 searchRange I FIELD field_28431 placeOnFloor Z diff --git a/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping index 489a4ad4ca..9ecb44457c 100644 --- a/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/class_5730 net/minecraft/world/gen/feature/SmallDripstoneFeature METHOD method_33034 generateDripstoneBlocks (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)V ARG 0 world + ARG 1 random ARG 2 pos ARG 3 config METHOD method_39175 getDirection (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Ljava/util/Optional; ARG 0 world ARG 1 pos + ARG 2 random diff --git a/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping index 4219911a9c..4009dc9a73 100644 --- a/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/TreePlacedFeatures.mapping @@ -26,3 +26,5 @@ CLASS net/minecraft/class_6818 net/minecraft/world/gen/feature/TreePlacedFeature FIELD field_36111 BIRCH_BEES_002 Lnet/minecraft/class_6880; FIELD field_36112 FANCY_OAK_BEES_0002 Lnet/minecraft/class_6880; FIELD field_36113 FANCY_OAK_BEES_002 Lnet/minecraft/class_6880; + FIELD field_38814 MANGROVE_CHECKED Lnet/minecraft/class_6880; + FIELD field_38815 TALL_MANGROVE_CHECKED Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping index 9c4bd3ccd6..58ddb677c9 100644 --- a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeat ARG 1 pos METHOD method_25987 generateVineColumn (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;III)V ARG 0 world + ARG 1 random ARG 2 pos ARG 3 maxLength ARG 4 minAge diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping index 9e28302864..42cd8dd5ef 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundConfiguredFeatures.mapping @@ -25,9 +25,10 @@ CLASS net/minecraft/class_6801 net/minecraft/world/gen/feature/UndergroundConfig FIELD field_35793 CAVE_VINES_PLANT_PROVIDER Lnet/minecraft/class_4657; FIELD field_35794 RANDOMIZED_AGE_CAVE_VINES_PROVIDER Lnet/minecraft/class_5929; FIELD field_38032 SCULK_VEIN_BLOCK Lnet/minecraft/class_5778; - FIELD field_38033 SCULK_PATCH Lnet/minecraft/class_6880; + FIELD field_38033 SCULK_PATCH_DEEP_DARK Lnet/minecraft/class_6880; FIELD field_38034 SCULK_VEIN Lnet/minecraft/class_6880; FIELD field_38035 GLOW_LICHEN_BLOCK Lnet/minecraft/class_5778; + FIELD field_38477 SCULK_PATCH_ANCIENT_CITY Lnet/minecraft/class_6880; METHOD method_39686 createSmallDripleafFeature ()Lnet/minecraft/class_6880; METHOD method_39687 createBigDripleafFeature (Lnet/minecraft/class_2350;)Lnet/minecraft/class_6880; ARG 0 direction diff --git a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping index e2c63a3d88..2a989c035c 100644 --- a/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/UndergroundPlacedFeatures.mapping @@ -16,5 +16,6 @@ CLASS net/minecraft/class_6812 net/minecraft/world/gen/feature/UndergroundPlaced FIELD field_35994 SPORE_BLOSSOM Lnet/minecraft/class_6880; FIELD field_35995 CLASSIC_VINES_CAVE_FEATURE Lnet/minecraft/class_6880; FIELD field_35996 AMETHYST_GEODE Lnet/minecraft/class_6880; - FIELD field_38036 SCULK_PATCH Lnet/minecraft/class_6880; + FIELD field_38036 SCULK_PATCH_DEEP_DARK Lnet/minecraft/class_6880; FIELD field_38037 SCULK_VEIN Lnet/minecraft/class_6880; + FIELD field_38478 SCULK_PATCH_ANCIENT_CITY Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping index 3d9a34f1e0..9c992f168b 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationConfiguredFeatures.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_6809 net/minecraft/world/gen/feature/VegetationConfigu FIELD field_35964 FLOWER_MEADOW Lnet/minecraft/class_6880; FIELD field_35965 FOREST_FLOWERS Lnet/minecraft/class_6880; FIELD field_35966 DARK_FOREST_VEGETATION Lnet/minecraft/class_6880; + FIELD field_38812 MANGROVE_VEGETATION Lnet/minecraft/class_6880; METHOD method_39717 createRandomPatchFeatureConfig (Lnet/minecraft/class_4651;I)Lnet/minecraft/class_4638; ARG 0 block ARG 1 tries diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping index 608d4a7308..e4bc094156 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping @@ -3,10 +3,12 @@ CLASS net/minecraft/class_5922 net/minecraft/world/gen/feature/VegetationPatchFe ARG 1 world ARG 2 config ARG 3 generator + ARG 4 random ARG 5 pos METHOD method_34316 placeGroundAndGetPositions (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;II)Ljava/util/Set; ARG 1 world ARG 2 config + ARG 3 random ARG 4 pos ARG 5 replaceable ARG 6 radiusX diff --git a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping index 32361f73a8..38d5924d66 100644 --- a/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/VegetationPlacedFeatures.mapping @@ -72,6 +72,7 @@ CLASS net/minecraft/class_6819 net/minecraft/world/gen/feature/VegetationPlacedF FIELD field_36184 PATCH_CACTUS_DESERT Lnet/minecraft/class_6880; FIELD field_36185 PATCH_CACTUS_DECORATED Lnet/minecraft/class_6880; FIELD field_36292 PATCH_MELON_SPARSE Lnet/minecraft/class_6880; + FIELD field_38816 TREES_MANGROVE Lnet/minecraft/class_6880; METHOD method_39738 modifiers (I)Ljava/util/List; ARG 0 count METHOD method_39739 modifiersWithChance (ILnet/minecraft/class_6797;)Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping index 73fae90916..b7dc17cdcc 100644 --- a/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping @@ -2,13 +2,16 @@ CLASS net/minecraft/class_4784 net/minecraft/world/gen/feature/WeepingVinesFeatu FIELD field_22196 DIRECTIONS [Lnet/minecraft/class_2350; METHOD method_24450 generateVineColumn (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;III)V ARG 0 world + ARG 1 random ARG 2 pos ARG 3 length ARG 4 minAge ARG 5 maxAge METHOD method_24451 generateNetherWartBlocksInArea (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V ARG 1 world + ARG 2 random ARG 3 pos METHOD method_24452 generateVinesInArea (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V ARG 1 world + ARG 2 random ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping index 0098a6f392..11d225edee 100644 --- a/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping +++ b/mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorat ARG 3 random ARG 4 logPositions ARG 5 leavesPositions + ARG 6 rootPositions METHOD method_23471 placeVine (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;)V ARG 0 replacer ARG 1 pos diff --git a/unpick-definitions/cat_types.unpick b/unpick-definitions/cat_types.unpick deleted file mode 100644 index 03b47c55e2..0000000000 --- a/unpick-definitions/cat_types.unpick +++ /dev/null @@ -1,18 +0,0 @@ -v2 - -constant cat_types net/minecraft/entity/passive/CatEntity TABBY_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity BLACK_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity RED_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity SIAMESE_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity BRITISH_SHORTHAIR_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity CALICO_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity PERSIAN_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity RAGDOLL_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity WHITE_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity JELLIE_TYPE -constant cat_types net/minecraft/entity/passive/CatEntity ALL_BLACK_TYPE - -target_method net/minecraft/entity/passive/CatEntity setCatType (I)V - param 0 cat_types -target_method net/minecraft/entity/passive/CatEntity getCatType ()I - return cat_types \ No newline at end of file diff --git a/unpick-definitions/entity_model_parts.unpick b/unpick-definitions/entity_model_parts.unpick index 09c16a7535..e1dafffff1 100644 --- a/unpick-definitions/entity_model_parts.unpick +++ b/unpick-definitions/entity_model_parts.unpick @@ -66,6 +66,11 @@ constant entity_model_parts net/minecraft/client/render/entity/model/EntityModel constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_FOOT constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_FOOT constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames EYES +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_TENDRIL +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_TENDRIL +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RIGHT_RIBCAGE +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames LEFT_RIBCAGE +constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames BONE target_method net/minecraft/client/model/ModelPart getChild (Ljava/lang/String;)Lnet/minecraft/client/model/ModelPart; param 0 entity_model_parts