diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 6627fdfd4e..d8d5d8f3f0 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -127,6 +127,11 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block ARG 2 side METHOD m_jeqzqmog (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 2 stack + METHOD m_jweqgtyb onLandedUpon (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_astfners;D)V + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 entity METHOD m_ksyzaetw dropStacks (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 0 state ARG 1 world diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index f2021d5c6d..98aaa60884 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity METHOD m_auxezlat writeId (Lnet/minecraft/unmapped/C_hhlwcnih;)V ARG 1 nbt METHOD m_bczwkfko getName ()Ljava/lang/String; + METHOD m_cckjpvhm readComponents (Lnet/minecraft/unmapped/C_hmcnusfu;)V METHOD m_cjlndzcv markDirty (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping index 69d4268b46..84d8579715 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping @@ -10,3 +10,6 @@ CLASS net/minecraft/unmapped/C_ottemwel net/minecraft/client/render/entity/featu ARG 3 entityType METHOD m_cunoojpm (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 levelToId + METHOD m_tzbcmpac getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_mnelcllg$C_htevrnhs; + ARG 1 hatLookUp + ARG 2 keyType diff --git a/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping index a829898b6e..ee2b7f38e0 100644 --- a/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/PolarBearEntityModel.mapping @@ -1 +1,2 @@ CLASS net/minecraft/unmapped/C_xkleumjd net/minecraft/client/render/entity/model/PolarBearEntityModel + METHOD m_ogjnvzzd getTexturedModelData (Z)Lnet/minecraft/unmapped/C_ybmhebgt; diff --git a/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping index 8f4bec9cfe..5b8eee271e 100644 --- a/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix.mapping @@ -1 +1,2 @@ CLASS net/minecraft/unmapped/C_wiukkyve net/minecraft/datafixer/fix/EntityEquipmentToArmorAndHandFix + METHOD m_mmrfunwl fixEquipment (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 6ea6e625b4..017948df4d 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -94,6 +94,7 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity FIELD f_ssljujsr LOGGER Lorg/slf4j/Logger; FIELD f_tigrjjuw DEFAULT_BOUNDING_BOX_WIDTH F FIELD f_tklhtpht entityChangeListener Lnet/minecraft/unmapped/C_ylpvpknw; + FIELD f_ujsjgylb fallDistance D FIELD f_vdsiqqmt prevPitch F FIELD f_vettyvgp hasVisualFire Z FIELD f_vlasppic pistonMovementTick J @@ -437,6 +438,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_iseshnfi isSpectator ()Z METHOD m_iybimkec shouldApplyBlockCollisionEffects ()Z METHOD m_iznakrow removeFromDimension ()V + METHOD m_izrsdktf handleFallDamage (DFLnet/minecraft/unmapped/C_sbxfkpyv;)Z + ARG 3 fallDistance + ARG 4 damageSource METHOD m_jaflucyh canSprintAsVehicle ()Z METHOD m_jaiycnbg damageClient (Lnet/minecraft/unmapped/C_sbxfkpyv;)Z ARG 1 source @@ -478,6 +482,9 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_krfnmqpx updateKilledAdvancementCriterion (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)V ARG 1 killer ARG 2 score + METHOD m_ksoidzkr collides (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Ljava/util/List;)Z + ARG 1 oldPos + ARG 2 newPos METHOD m_kvelccqq applyMirror (Lnet/minecraft/unmapped/C_qomzaqud;)F ARG 1 mirror METHOD m_kvxkjouy setFireTicks (I)V @@ -856,6 +863,8 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_wjodonhd isInvisible ()Z METHOD m_wkqvrgdz canAddPassenger (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 passenger + METHOD m_wmrqudhe checkBlockCollisions (Ljava/util/List;Lnet/minecraft/unmapped/C_astfners$C_oyjomgjq;)V + ARG 1 collisionChecks METHOD m_wmxlrpiw getPos ()Lnet/minecraft/unmapped/C_vgpupfxx; COMMENT {@return the position in the world of this entity} METHOD m_wnmvwdkc playSwimSound ()V diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 484a6ff6be..36946f85e7 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -301,6 +301,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity COMMENT @see #heal(float) ARG 1 health COMMENT the amount of health + METHOD m_kivskbpm computeFallDamage (DF)I + ARG 3 fallDistance METHOD m_knkzhatw getHealth ()F COMMENT Gets the amount of health this entity has in half-hearts. COMMENT diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping index 1bb074be0c..5eab907279 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerTaskListProvider.mapping @@ -3,11 +3,29 @@ CLASS net/minecraft/unmapped/C_nnvgypzk net/minecraft/entity/ai/brain/task/Villa FIELD f_hcwjqxxn INTERACT_SPEED_MODIFIER F FIELD f_ktculwgn INTERACT_DISTANCE_SQUARE I FIELD f_mlxgobtd INTERACT_WALK_UP_DISTANCE I + METHOD m_cvulgfyw createIdleTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed + METHOD m_jsmlpkkk createPanicTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed + METHOD m_kiupapdp createHideTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed METHOD m_ksqjhvns createPlayTasks (F)Lcom/google/common/collect/ImmutableList; ARG 0 speed + METHOD m_mqeccfcy createWorkTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed + METHOD m_nospjuhz createCoreTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed + METHOD m_tfcgmnac createPreRaidTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed METHOD m_uqrujxkm hasActiveRaid (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 entity METHOD m_utnmlskg createBusyFollowTask ()Lcom/mojang/datafixers/util/Pair; + METHOD m_wmjhkzvy createMeetTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed METHOD m_yltipasg hasWonRaid (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 entity METHOD m_ynpvnlqa createFreeFollowTask ()Lcom/mojang/datafixers/util/Pair; + METHOD m_zeujnumd createRestTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed + METHOD m_zlxyxoak createRaidTasks (Lnet/minecraft/unmapped/C_cjzoxshv;F)Lcom/google/common/collect/ImmutableList; + ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping index f81741005c..d053ef851e 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WorkStationCompetitionTask.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/unmapped/C_vxwwyzne net/minecraft/entity/ai/brain/task/WorkS ARG 1 poiType ARG 2 villager ARG 3 villager + METHOD m_xmcctqkk isCompletedWorkStation (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv;)Z + ARG 0 poiType METHOD m_zbwohokk keepJobSiteForMoreExperiencedVillager (Lnet/minecraft/unmapped/C_pdtkdbte;Lnet/minecraft/unmapped/C_pdtkdbte;)Lnet/minecraft/unmapped/C_pdtkdbte; ARG 0 first ARG 1 second diff --git a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping index f7b36239d5..c03011ae75 100644 --- a/mappings/net/minecraft/entity/mob/CreakingBrain.mapping +++ b/mappings/net/minecraft/entity/mob/CreakingBrain.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/unmapped/C_nkqatzha net/minecraft/entity/mob/CreakingBrain FIELD f_spaomsvc MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD f_uavqxrpw SENSORS Lcom/google/common/collect/ImmutableList; METHOD m_fdgcwgsd addIdleActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V + METHOD m_hhynauwr addFightActivities (Lnet/minecraft/unmapped/C_vbugwmii;Lnet/minecraft/unmapped/C_rjqjaxef;)V + METHOD m_rxjjsjcj create (Lnet/minecraft/unmapped/C_vbugwmii;Lnet/minecraft/unmapped/C_rjqjaxef;)Lnet/minecraft/unmapped/C_rjqjaxef; METHOD m_suwefzcr addCoreActivities (Lnet/minecraft/unmapped/C_rjqjaxef;)V METHOD m_vpamiunc createProfile ()Lnet/minecraft/unmapped/C_rjqjaxef$C_liifzsnq; METHOD m_wvhfkjve updateActivities (Lnet/minecraft/unmapped/C_vbugwmii;)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 1a2ddee2bf..b609c14682 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -274,6 +274,9 @@ CLASS net/minecraft/unmapped/C_jzrpycqo net/minecraft/entity/player/PlayerEntity ARG 1 pos ARG 2 facing ARG 3 stack + METHOD m_wbynhygu hasSpaceBelow (DDD)Z + ARG 1 xOffset + ARG 3 zOffset METHOD m_whbjjnjc startFallFlying ()V METHOD m_wjlgxwvh canHarvest (Lnet/minecraft/unmapped/C_txtbiemp;)Z COMMENT Determines whether the player is able to harvest drops from the specified block state. diff --git a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping index 3d8730e17f..3f5d41acb3 100644 --- a/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/TntMinecartEntity.mapping @@ -12,4 +12,5 @@ CLASS net/minecraft/unmapped/C_joafvsgg net/minecraft/entity/vehicle/TntMinecart METHOD m_ktllqqbk explode (Lnet/minecraft/unmapped/C_sbxfkpyv;D)V ARG 1 damageSource ARG 2 power + METHOD m_lfapculi prime (Lnet/minecraft/unmapped/C_sbxfkpyv;)V METHOD m_qntaideu getFuseTicks ()I diff --git a/mappings/net/minecraft/server/command/CloneCommand.mapping b/mappings/net/minecraft/server/command/CloneCommand.mapping index 6df08192e0..82980adb4d 100644 --- a/mappings/net/minecraft/server/command/CloneCommand.mapping +++ b/mappings/net/minecraft/server/command/CloneCommand.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/unmapped/C_zszjjrcg net/minecraft/server/command/CloneComman FIELD f_sdbandff FAILED_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD m_awibmfmo (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/unmapped/C_bdwnwhiu; ARG 0 commandContext + METHOD m_bwpzsyje cloneFromDimension (Lnet/minecraft/unmapped/C_bprdujxm;Lnet/minecraft/unmapped/C_tpsoijgn;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 context METHOD m_hcngrbji (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/unmapped/C_bdwnwhiu; ARG 0 commandContext METHOD m_ibudsixa (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/unmapped/C_bdwnwhiu; @@ -20,6 +22,8 @@ CLASS net/minecraft/unmapped/C_zszjjrcg net/minecraft/server/command/CloneComman METHOD m_kzrhpfqb getLocation (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/lang/String;)Lnet/minecraft/unmapped/C_zszjjrcg$C_xgfeonzc; ARG 0 context ARG 2 name + METHOD m_qhwofutk addFilters (Lnet/minecraft/unmapped/C_tpsoijgn;Lnet/minecraft/unmapped/C_tpsoijgn;Lnet/minecraft/unmapped/C_tpsoijgn;Lnet/minecraft/unmapped/C_tpsoijgn;ZLcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 5 builder METHOD m_qjynfdjz (Lnet/minecraft/unmapped/C_gogfiawf;)Z ARG 0 pos METHOD m_viotujcp execute (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_zszjjrcg$C_xgfeonzc;Lnet/minecraft/unmapped/C_zszjjrcg$C_xgfeonzc;Lnet/minecraft/unmapped/C_zszjjrcg$C_xgfeonzc;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_zszjjrcg$C_vwecscwt;Z)I diff --git a/mappings/net/minecraft/server/command/dev/TestCommand.mapping b/mappings/net/minecraft/server/command/dev/TestCommand.mapping index 497fcdd056..bb13434442 100644 --- a/mappings/net/minecraft/server/command/dev/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/dev/TestCommand.mapping @@ -6,8 +6,14 @@ CLASS net/minecraft/unmapped/C_szyhvlkg net/minecraft/server/command/dev/TestCom FIELD f_kttshgcw DEFAULT_Z_SIZE I FIELD f_uypiqojt SHOW_POS_DURATION_MS I FIELD f_yapsccle DEFAULT_X_SIZE I + METHOD m_antzrgrj (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/unmapped/C_nuydtmin; + ARG 0 context METHOD m_bugjysoi (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD m_coulqodm register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/unmapped/C_bprdujxm;)V + ARG 0 dispatcher + METHOD m_njgeggzq executeExport (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_cjzoxshv;)I + ARG 0 source METHOD m_optseryq createTestPositionAround (Lnet/minecraft/unmapped/C_pennblrk;)Lnet/minecraft/unmapped/C_hynzadkk; ARG 0 source METHOD m_rnezqmot (Lcom/mojang/brigadier/context/CommandContext;)I @@ -15,13 +21,21 @@ CLASS net/minecraft/unmapped/C_szyhvlkg net/minecraft/server/command/dev/TestCom METHOD m_rucgehlr executePos (Lnet/minecraft/unmapped/C_pennblrk;Ljava/lang/String;)I ARG 0 source ARG 1 variableName + METHOD m_ttgvrype (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/unmapped/C_nuydtmin; + ARG 0 context METHOD m_vxxvbudg (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD m_wgtkkdvk (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD m_yiyhmeeh (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD m_zhsgchtu isValidStructure (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_ncpywfca;)Z METHOD m_zlhdsfic (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD m_zsojtrzx executeCreate (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_ncpywfca;III)I + ARG 0 source + ARG 2 x + ARG 3 y + ARG 4 z CLASS C_errlhata Listener FIELD f_zfjtxoyf tests Lnet/minecraft/unmapped/C_ancwczjx; diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 3dbc772e1a..235672348a 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_agwojffm net/minecraft/test/GameTestState FIELD f_aptnrqfd initialized Z + FIELD f_cncaolaa tick I FIELD f_cykwpirb throwable Ljava/lang/Throwable; FIELD f_cyllvwin timedTaskRunners Ljava/util/Collection; FIELD f_czxnhwhd world Lnet/minecraft/unmapped/C_bdwnwhiu; @@ -50,5 +51,6 @@ CLASS net/minecraft/unmapped/C_agwojffm net/minecraft/test/GameTestState METHOD m_wrjdjkvm isFlaky ()Z METHOD m_wzfspxut getMaxAttempts ()I METHOD m_xnccdubt isFailed ()Z + METHOD m_xsidzmjn getTick ()I METHOD m_ysygmbjx isStarted ()Z METHOD m_zxeybpte getRequiredSuccesses ()I diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 5168562a21..ed739c0668 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_jhjabajs net/minecraft/test/StructureTestUtil FIELD f_hincrhei DEFAULT_TEST_STRUCTURES_DIRECTORY_NAME Ljava/lang/String; + FIELD f_nqmecbog testStructuresDirectoryName Ljava/nio/file/Path; METHOD m_ofozplxp isInStructureBounds (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Z ARG 0 structureBlockPos ARG 1 pos diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 77f55b30ef..181fe63ca5 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -41,6 +41,8 @@ CLASS net/minecraft/unmapped/C_ncfucati net/minecraft/test/TestContext METHOD m_cwiwswyj expectEntity (Lnet/minecraft/unmapped/C_ogavsvbr;)V ARG 1 testedType METHOD m_dfaxzeen getWorld ()Lnet/minecraft/unmapped/C_bdwnwhiu; + METHOD m_dfmqgzom assertTrue (ZLnet/minecraft/unmapped/C_rdaqiwdt;)V + ARG 1 value METHOD m_dfzsbsqp expectDifferentBlock (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 block ARG 2 pos @@ -132,6 +134,10 @@ CLASS net/minecraft/unmapped/C_ncfucati net/minecraft/test/TestContext ARG 2 x ARG 3 y ARG 4 z + METHOD m_mlrsisav getBlockEntity (Lnet/minecraft/unmapped/C_hynzadkk;Ljava/lang/Class;)Lnet/minecraft/unmapped/C_kvegafmh; + ARG 1 pos + METHOD m_neawohhp assertFalse (ZLnet/minecraft/unmapped/C_rdaqiwdt;)V + ARG 1 value METHOD m_nxdzuxuc expectEmptyContainer (Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 pos METHOD m_ocafvsoi removeBlock (Lnet/minecraft/unmapped/C_hynzadkk;)V diff --git a/mappings/net/minecraft/test/TestServer.mapping b/mappings/net/minecraft/test/TestServer.mapping index 4f9be2d57c..deecd28b06 100644 --- a/mappings/net/minecraft/test/TestServer.mapping +++ b/mappings/net/minecraft/test/TestServer.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/unmapped/C_eeklmnkp net/minecraft/test/TestServer FIELD f_zngcxdij testSet Lnet/minecraft/unmapped/C_ancwczjx; FIELD f_zwsyrjiw TEST_POSITION_RANGE I METHOD m_bnagivtl isTesting ()Z + METHOD m_fqutafjg create (Ljava/lang/Thread;Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lnet/minecraft/unmapped/C_dqfyacfy;Ljava/util/Optional;Z)Lnet/minecraft/unmapped/C_eeklmnkp; + ARG 0 thread + ARG 1 session + ARG 2 packManager METHOD m_iwxxjlll runTestBatches (Lnet/minecraft/unmapped/C_bdwnwhiu;)V ARG 1 world METHOD m_lakmictj (Lnet/minecraft/unmapped/C_agwojffm;)V diff --git a/mappings/net/minecraft/test/TimedTaskRunner.mapping b/mappings/net/minecraft/test/TimedTaskRunner.mapping index ba6783b716..ea3b1bdb05 100644 --- a/mappings/net/minecraft/test/TimedTaskRunner.mapping +++ b/mappings/net/minecraft/test/TimedTaskRunner.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_slbbddbd net/minecraft/test/TimedTaskRunner FIELD f_dceumnvh tasks Ljava/util/List; FIELD f_laliwahc test Lnet/minecraft/unmapped/C_agwojffm; + FIELD f_uonlewcl tick I METHOD (Lnet/minecraft/unmapped/C_agwojffm;)V ARG 1 gameTest METHOD m_culdbhre executeAfter (ILjava/lang/Runnable;)Lnet/minecraft/unmapped/C_slbbddbd; @@ -16,13 +17,19 @@ CLASS net/minecraft/unmapped/C_slbbddbd net/minecraft/test/TimedTaskRunner ARG 1 task METHOD m_negtjhjf fail (Ljava/util/function/Supplier;)V ARG 1 exceptionSupplier + METHOD m_rtosaukf runTasks (I)V METHOD m_sbznpemx execute (Ljava/lang/Runnable;)Lnet/minecraft/unmapped/C_slbbddbd; ARG 1 task + METHOD m_stsofrqu runReported (I)V METHOD m_woeesxrq trigger ()Lnet/minecraft/unmapped/C_slbbddbd$C_ktwdwqxw; METHOD m_yaecigfs executeFor (ILjava/lang/Runnable;)Lnet/minecraft/unmapped/C_slbbddbd; ARG 1 delay ARG 2 task METHOD m_zbwitmsh idle (I)Lnet/minecraft/unmapped/C_slbbddbd; ARG 1 delay + METHOD m_zgvpyocn runSilently (I)V CLASS C_ktwdwqxw Trigger + FIELD f_altxqvwn UNTRIGGERED_TICK I + FIELD f_oygmyyfp triggeredTick I METHOD m_brourrwc checkTrigger ()V + METHOD m_sscufdja trigger (I)V diff --git a/mappings/net/minecraft/text/MutableText.mapping b/mappings/net/minecraft/text/MutableText.mapping index c35ffb7c4c..3a0a2f0956 100644 --- a/mappings/net/minecraft/text/MutableText.mapping +++ b/mappings/net/minecraft/text/MutableText.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_npqneive net/minecraft/text/MutableText FIELD f_fggxfgch language Lnet/minecraft/unmapped/C_gedhbjjb; FIELD f_fhizxfyx ordered Lnet/minecraft/unmapped/C_apvkgwyi; FIELD f_gwqwjofn style Lnet/minecraft/unmapped/C_cpwnhism; + FIELD f_rvaoapfk component Lnet/minecraft/unmapped/C_jywkqnmy; FIELD f_ulczlyna siblings Ljava/util/List; METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -20,6 +21,7 @@ CLASS net/minecraft/unmapped/C_npqneive net/minecraft/text/MutableText COMMENT @see #setStyle(Style) ARG 1 styleUpdater COMMENT the style updater + METHOD m_fidejdrc create (Lnet/minecraft/unmapped/C_jywkqnmy;)Lnet/minecraft/unmapped/C_npqneive; METHOD m_isapqsly setColor (I)Lnet/minecraft/unmapped/C_npqneive; ARG 1 color METHOD m_jdmpmdpf formatted ([Lnet/minecraft/unmapped/C_tnezalvh;)Lnet/minecraft/unmapped/C_npqneive; diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index 5ba3331cdc..f650c875bd 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -94,6 +94,8 @@ CLASS net/minecraft/unmapped/C_rdaqiwdt net/minecraft/text/Text COMMENT the translation key ARG 1 args COMMENT the arguments the translation may take + METHOD m_pwvegngp asComponent ()Lnet/minecraft/unmapped/C_jywkqnmy; + COMMENT {@return a component representation of this text} METHOD m_rxxicskz copy ()Lnet/minecraft/unmapped/C_npqneive; COMMENT Copies the text's content, the style, and the siblings. COMMENT

diff --git a/mappings/net/minecraft/text/component/KeyBindComponent.mapping b/mappings/net/minecraft/text/component/KeyBindComponent.mapping index b040f55c55..65d30edde1 100644 --- a/mappings/net/minecraft/text/component/KeyBindComponent.mapping +++ b/mappings/net/minecraft/text/component/KeyBindComponent.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_scqpkchq net/minecraft/text/component/KeyBindComponent FIELD f_fbdqazsa CODEC Lcom/mojang/serialization/MapCodec; FIELD f_lcgfpmfj text Ljava/util/function/Supplier; + FIELD f_lqxhjber TYPE Lnet/minecraft/unmapped/C_jywkqnmy$C_hytcpjos; FIELD f_voavntrz key Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 key diff --git a/mappings/net/minecraft/text/component/NbtComponent.mapping b/mappings/net/minecraft/text/component/NbtComponent.mapping index 77782c6af1..4eaa5dee38 100644 --- a/mappings/net/minecraft/text/component/NbtComponent.mapping +++ b/mappings/net/minecraft/text/component/NbtComponent.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_tvzpgqlc net/minecraft/text/component/NbtComponen FIELD f_ffcigvcs separator Ljava/util/Optional; FIELD f_imwirfmg path Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey; FIELD f_inmzzmlo LOGGER Lorg/slf4j/Logger; + FIELD f_ltfhnriv TYPE Lnet/minecraft/unmapped/C_jywkqnmy$C_hytcpjos; FIELD f_suokeamh pathPattern Ljava/lang/String; FIELD f_zjqmzprp CODEC Lcom/mojang/serialization/MapCodec; METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey;ZLjava/util/Optional;Lnet/minecraft/unmapped/C_pfocmsrt;)V diff --git a/mappings/net/minecraft/text/component/ScoreComponent.mapping b/mappings/net/minecraft/text/component/ScoreComponent.mapping index 3b4661fba8..099f5e16a0 100644 --- a/mappings/net/minecraft/text/component/ScoreComponent.mapping +++ b/mappings/net/minecraft/text/component/ScoreComponent.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_rjywhoyw net/minecraft/text/component/ScoreCompon FIELD f_ijyikulf objective Ljava/lang/String; FIELD f_kihbpfxo name Lcom/mojang/datafixers/util/Either; FIELD f_lbsgdplz CODEC Lcom/mojang/serialization/MapCodec; + FIELD f_mgxrluva TYPE Lnet/minecraft/unmapped/C_jywkqnmy$C_hytcpjos; FIELD f_pibdjehx INNER_CODEC Lcom/mojang/serialization/MapCodec; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/text/component/SelectorComponent.mapping b/mappings/net/minecraft/text/component/SelectorComponent.mapping index c4b6dd3096..fa07387f98 100644 --- a/mappings/net/minecraft/text/component/SelectorComponent.mapping +++ b/mappings/net/minecraft/text/component/SelectorComponent.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_mvxjmafd net/minecraft/text/component/SelectorCom FIELD f_liyiswnc separator Ljava/util/Optional; FIELD f_oiseywek CODEC Lcom/mojang/serialization/MapCodec; FIELD f_paqwsnhp entitySelector Lnet/minecraft/unmapped/C_guiotivj; + FIELD f_xglqzpil TYPE Lnet/minecraft/unmapped/C_jywkqnmy$C_hytcpjos; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_jznvkzbf (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/text/component/StringComponent.mapping b/mappings/net/minecraft/text/component/StringComponent.mapping index 1758ff5f36..2ec01767ac 100644 --- a/mappings/net/minecraft/text/component/StringComponent.mapping +++ b/mappings/net/minecraft/text/component/StringComponent.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_dysqleov net/minecraft/text/component/StringComponent FIELD f_gfvhbmuz CODEC Lcom/mojang/serialization/MapCodec; FIELD f_gvhbipze EMPTY Lnet/minecraft/unmapped/C_dysqleov; + FIELD f_zcqqykmx CODEC_COMPONENT Lnet/minecraft/unmapped/C_jywkqnmy$C_hytcpjos; METHOD m_fxddodle (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD m_mmyhqxym of (Ljava/lang/String;)Lnet/minecraft/unmapped/C_dysqleov; diff --git a/mappings/net/minecraft/text/component/TranslatableComponent.mapping b/mappings/net/minecraft/text/component/TranslatableComponent.mapping index ff7ae33500..06f5ff394d 100644 --- a/mappings/net/minecraft/text/component/TranslatableComponent.mapping +++ b/mappings/net/minecraft/text/component/TranslatableComponent.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_fdvjwnmn net/minecraft/text/component/Translatabl FIELD f_awlkgjza fallback Ljava/lang/String; FIELD f_brxauvga FORMAT_PATTERN Ljava/util/regex/Pattern; FIELD f_ikouuvof CODEC Lcom/mojang/serialization/MapCodec; + FIELD f_meekorlg TYPE Lnet/minecraft/unmapped/C_jywkqnmy$C_hytcpjos; FIELD f_omftoutr PRIMITIVE_ARGUMENT_CODEC Lcom/mojang/serialization/Codec; FIELD f_ozobodue EMPTY_ARGS [Ljava/lang/Object; FIELD f_rjlzload PERCENT Lnet/minecraft/unmapped/C_xzalvetc; diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 80a729424f..1d0160c2ca 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -207,6 +207,8 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers FIELD f_ushcytlj iconType Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_vwiqlfbj experience I CLASS C_vphnlyjn VillagerTypeSpecificFactory + METHOD m_ggpbncsc createTradeForBiomes (Lnet/minecraft/unmapped/C_hqrlptsj$C_bcdfyrkn;[Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_hqrlptsj$C_vphnlyjn; + ARG 0 factory CLASS C_wututmqp TypeAwareBuyForOneEmeraldFactory FIELD f_leqjftkp maxUses I FIELD f_pxdyebdl count I diff --git a/mappings/net/minecraft/village/VillagerData.mapping b/mappings/net/minecraft/village/VillagerData.mapping index a6fb29a8e7..1ed6272cff 100644 --- a/mappings/net/minecraft/village/VillagerData.mapping +++ b/mappings/net/minecraft/village/VillagerData.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/unmapped/C_zuqrzrur net/minecraft/village/VillagerData FIELD f_dxcgixir level I FIELD f_eachtuxh CODEC Lcom/mojang/serialization/Codec; FIELD f_pfwszziv MIN_LEVEL I + FIELD f_pucgcgih type Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_qmhqzzmn MAX_LEVEL I + FIELD f_wcnfuadm profession Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_xovgoapg PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_ggwtqpik (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/village/VillagerProfession.mapping b/mappings/net/minecraft/village/VillagerProfession.mapping index 7c926a1b54..f0f602cd40 100644 --- a/mappings/net/minecraft/village/VillagerProfession.mapping +++ b/mappings/net/minecraft/village/VillagerProfession.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_yhqxfbuc net/minecraft/village/VillagerProfession FIELD f_obosegzt primaryJobSites Ljava/util/function/Predicate; FIELD f_otcpaipa workSound Lnet/minecraft/unmapped/C_avavozay; FIELD f_vqqijdeq ANY_JOB_SITE Ljava/util/function/Predicate; + FIELD f_whefzzlg name Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_fxwoqbac (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_cjzoxshv;)Z ARG 1 holder METHOD m_jgkpjnge (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_cjzoxshv;)Z diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping index 2f2510c047..86fb25b96c 100644 --- a/mappings/net/minecraft/village/VillagerType.mapping +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -1,4 +1,14 @@ CLASS net/minecraft/unmapped/C_vhpfztda net/minecraft/village/VillagerType + FIELD f_acnpevae DESERT Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_bznlialw TAIGA Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_cntmtjpu SWAMP Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_kkpqkchn SAVANNA Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_qnynlqfd JUNGLE Lnet/minecraft/unmapped/C_xhhleach; FIELD f_swjywohe BIOME_TO_TYPE Ljava/util/Map; + FIELD f_tttaqaed PLAINS Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_ymgdnuki SNOW Lnet/minecraft/unmapped/C_xhhleach; METHOD m_goybjwfq (Ljava/util/HashMap;)V ARG 0 map + METHOD m_hurfflhu forBiome (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 biome + METHOD m_wkevkpot create (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vhpfztda; diff --git a/unpick/definitions/entity_flags.unpick b/unpick/definitions/entity_flags.unpick index 0950cc0f35..757896f390 100644 --- a/unpick/definitions/entity_flags.unpick +++ b/unpick/definitions/entity_flags.unpick @@ -25,7 +25,6 @@ target_method net/minecraft/entity/passive/FoxEntity setFoxFlag (IZ)V constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity TAMED_FLAG -constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity SADDLED_FLAG constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity BRED_FLAG constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity EATING_GRASS_FLAG constant horse_flags net/minecraft/entity/passive/AbstractHorseEntity ANGRY_FLAG