diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 071b650601..5c83bf66a2 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -3,12 +3,48 @@ CLASS net/minecraft/unmapped/C_kdwyuhdb net/minecraft/advancement/Advancement FIELD f_emngvigd requirements Lnet/minecraft/unmapped/C_wbfyxnvb; FIELD f_eqsfnrjr criteria Ljava/util/Map; FIELD f_eykiurph display Ljava/util/Optional; + FIELD f_njhcraol name Ljava/util/Optional; FIELD f_nwvdgawt sendsTelemetryEvent Z FIELD f_uhuyjydl rewards Lnet/minecraft/unmapped/C_wptigggq; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/unmapped/C_wptigggq;Ljava/util/Map;Lnet/minecraft/unmapped/C_wbfyxnvb;Z)V + ARG 1 id + ARG 2 display + ARG 3 rewards + ARG 4 criteria + ARG 5 requirements + ARG 6 sendsTelemetryEvent METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD m_ggypmlkv doesSendTelemetryEvent ()Z - CLASS C_dukbjvrv Task + METHOD m_bqlcljku toJson ()Lcom/google/gson/JsonObject; + METHOD m_ggypmlkv sendsTelemetryEvent ()Z + METHOD m_hcfbmzas (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism; + ARG 1 text + METHOD m_hpxxrezd fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_kdwyuhdb; + ARG 0 buf + METHOD m_htjukofs parent ()Ljava/util/Optional; + METHOD m_jqhmxcpz (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_bvqakncm;)V + ARG 1 display + METHOD m_ocjwqiep (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 1 parent + METHOD m_ofikdsfj rewards ()Lnet/minecraft/unmapped/C_wptigggq; + METHOD m_ojjmhgkm fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_kdwyuhdb; + ARG 0 obj + ARG 1 deserializer + METHOD m_swogstqz getText (Lnet/minecraft/unmapped/C_unoypvme;)Lnet/minecraft/unmapped/C_rdaqiwdt; + ARG 0 advancementHolder + METHOD m_vdmpoqil requirements ()Lnet/minecraft/unmapped/C_wbfyxnvb; + METHOD m_vfnevnhx name ()Ljava/util/Optional; + METHOD m_wngxatfp display ()Ljava/util/Optional; + METHOD m_wsihwdxp empty ()Z + METHOD m_xazdqguv criteria ()Ljava/util/Map; + METHOD m_xbcnitcp createText (Lnet/minecraft/unmapped/C_bvqakncm;)Lnet/minecraft/unmapped/C_rdaqiwdt; + ARG 0 display + METHOD m_xfimowjn toPacket (Lnet/minecraft/unmapped/C_idfydwco;)V + ARG 1 buf + METHOD m_xqjzcrqy (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_bvqakncm;)V + ARG 0 buf + ARG 1 display + CLASS C_dukbjvrv Builder FIELD f_bdgdqmsj sendsTelemetryEvent Z FIELD f_cicbhyoi requirements Ljava/util/Optional; FIELD f_gkkpggfx rewards Lnet/minecraft/unmapped/C_wptigggq; @@ -16,8 +52,13 @@ CLASS net/minecraft/unmapped/C_kdwyuhdb net/minecraft/advancement/Advancement FIELD f_vlwysjpx criteria Lcom/google/common/collect/ImmutableMap$Builder; FIELD f_vwzzsrub display Ljava/util/Optional; FIELD f_wpvukjwy merger Lnet/minecraft/unmapped/C_wbfyxnvb$C_huwvdbdx; + METHOD m_ckalgnkc merger (Lnet/minecraft/unmapped/C_wbfyxnvb$C_huwvdbdx;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 1 merger METHOD m_jlhvlwgp display (Lnet/minecraft/unmapped/C_bvqakncm;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 1 display + METHOD m_liavgrzl putCriteria (Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 1 name + ARG 2 criterion METHOD m_mpypjyhz display (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_gcthizso;ZZZ)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 1 icon ARG 2 title @@ -27,6 +68,10 @@ CLASS net/minecraft/unmapped/C_kdwyuhdb net/minecraft/advancement/Advancement ARG 6 showToast ARG 7 announceToChat ARG 8 hidden + METHOD m_mshncpue requirements (Lnet/minecraft/unmapped/C_wbfyxnvb;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 1 requirements + METHOD m_ofouvzjr parent (Lnet/minecraft/unmapped/C_unoypvme;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 1 advancementHolder METHOD m_oqffddpf create ()Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; METHOD m_ozlfpvhc display (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_gcthizso;ZZZ)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 1 icon @@ -43,6 +88,7 @@ CLASS net/minecraft/unmapped/C_kdwyuhdb net/minecraft/advancement/Advancement ARG 2 id METHOD m_uftuvurm parent (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 1 parentId + METHOD m_xcavlqpa sendsTelemetryEvent ()Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; METHOD m_xfgxgmkz build (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_unoypvme; ARG 1 id METHOD m_xkgvhpps rewards (Lnet/minecraft/unmapped/C_wptigggq;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; diff --git a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping index 7a26cb0da1..2ed84a2859 100644 --- a/mappings/net/minecraft/advancement/AdvancementCriterion.mapping +++ b/mappings/net/minecraft/advancement/AdvancementCriterion.mapping @@ -1,6 +1,16 @@ CLASS net/minecraft/unmapped/C_rzypsigz net/minecraft/advancement/AdvancementCriterion - FIELD f_bjqitkog conditions Lnet/minecraft/unmapped/C_mysyaxfs; + FIELD f_bjqitkog trigger Lnet/minecraft/unmapped/C_mysyaxfs; + FIELD f_yiamcoxx conditions Lnet/minecraft/unmapped/C_zkhebbek; METHOD m_bdrggclo criteriaFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;)Ljava/util/Map; - ARG 0 obj + ARG 0 json ARG 1 predicateDeserializer + METHOD m_djfutiin trigger ()Lnet/minecraft/unmapped/C_mysyaxfs; METHOD m_ergjuflg toJson ()Lcom/google/gson/JsonElement; + METHOD m_gqhesppv fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;Lnet/minecraft/unmapped/C_mysyaxfs;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 json + ARG 1 deserializer + ARG 2 trigger + METHOD m_iuvjqrcn conditions ()Lnet/minecraft/unmapped/C_zkhebbek; + METHOD m_tjbkkoxt fromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 json + ARG 1 deserializer diff --git a/mappings/net/minecraft/advancement/AdvancementFrame.mapping b/mappings/net/minecraft/advancement/AdvancementFrame.mapping index 8eb304c7df..ed8305e42a 100644 --- a/mappings/net/minecraft/advancement/AdvancementFrame.mapping +++ b/mappings/net/minecraft/advancement/AdvancementFrame.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/unmapped/C_gcthizso net/minecraft/advancement/AdvancementFra FIELD f_gdwftxmc id Ljava/lang/String; FIELD f_rnjbzxqk toastText Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_xbulmxrz titleFormat Lnet/minecraft/unmapped/C_tnezalvh; + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/unmapped/C_tnezalvh;)V + ARG 3 id + ARG 4 titleFormat METHOD m_femlazur getId ()Ljava/lang/String; METHOD m_nlshnnji getToastText ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_sfdtydcs forName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_gcthizso; diff --git a/mappings/net/minecraft/advancement/AdvancementHolder.mapping b/mappings/net/minecraft/advancement/AdvancementHolder.mapping new file mode 100644 index 0000000000..36d7e063bf --- /dev/null +++ b/mappings/net/minecraft/advancement/AdvancementHolder.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/unmapped/C_unoypvme net/minecraft/advancement/AdvancementHolder + FIELD f_gsvddiie id Lnet/minecraft/unmapped/C_ncpywfca; + FIELD f_ymlvdryq data Lnet/minecraft/unmapped/C_kdwyuhdb; + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD m_bytjodal fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_unoypvme; + ARG 0 buf + METHOD m_dqqhmldt data ()Lnet/minecraft/unmapped/C_kdwyuhdb; + METHOD m_uatbbige id ()Lnet/minecraft/unmapped/C_ncpywfca; + METHOD m_ysryvxxq toPacket (Lnet/minecraft/unmapped/C_idfydwco;)V + ARG 1 buf diff --git a/mappings/net/minecraft/advancement/AdvancementNode.mapping b/mappings/net/minecraft/advancement/AdvancementNode.mapping new file mode 100644 index 0000000000..9679753bad --- /dev/null +++ b/mappings/net/minecraft/advancement/AdvancementNode.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/unmapped/C_seqaydby net/minecraft/advancement/AdvancementNode + FIELD f_tleelijd parent Lnet/minecraft/unmapped/C_seqaydby; + FIELD f_wlgfpged children Ljava/util/Set; + FIELD f_zbchbwmg advancementHolder Lnet/minecraft/unmapped/C_unoypvme; + METHOD m_ayqwuyla getParent ()Lnet/minecraft/unmapped/C_seqaydby; + METHOD m_fitgxnky findRoot (Lnet/minecraft/unmapped/C_seqaydby;)Lnet/minecraft/unmapped/C_seqaydby; + ARG 0 node + METHOD m_skgswafw getRoot ()Lnet/minecraft/unmapped/C_seqaydby; + METHOD m_vpwsyrbg getAdvancement ()Lnet/minecraft/unmapped/C_kdwyuhdb; + METHOD m_wrfrypzf getChildren ()Ljava/lang/Iterable; + METHOD m_ylxpjqhl getAdvancementHolder ()Lnet/minecraft/unmapped/C_unoypvme; + METHOD m_ynqoruuj addChild (Lnet/minecraft/unmapped/C_seqaydby;)V + ARG 1 child diff --git a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping index 987ede6f59..01accc42f1 100644 --- a/mappings/net/minecraft/advancement/AdvancementPositioner.mapping +++ b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_dqdihuga net/minecraft/advancement/AdvancementPos FIELD f_prctiroq children Ljava/util/List; FIELD f_rivxclan parent Lnet/minecraft/unmapped/C_dqdihuga; FIELD f_tqpltjrh substituteChild Lnet/minecraft/unmapped/C_dqdihuga; + FIELD f_wuldntie node Lnet/minecraft/unmapped/C_seqaydby; FIELD f_xiqyqyaz shift F FIELD f_xwpswyow depth I FIELD f_youqvfcv change F @@ -21,6 +22,8 @@ CLASS net/minecraft/unmapped/C_dqdihuga net/minecraft/advancement/AdvancementPos METHOD m_ihadftgm onFinishCalculation (Lnet/minecraft/unmapped/C_dqdihuga;)Lnet/minecraft/unmapped/C_dqdihuga; ARG 1 last METHOD m_iwnxvukg getLastChild ()Lnet/minecraft/unmapped/C_dqdihuga; + METHOD m_jpeohigz (Lnet/minecraft/unmapped/C_bvqakncm;)V + ARG 1 display METHOD m_lihmajuz findMinRowRecursively (FIF)F ARG 1 deltaRow ARG 2 depth @@ -30,5 +33,7 @@ CLASS net/minecraft/unmapped/C_dqdihuga net/minecraft/advancement/AdvancementPos ARG 2 defaultAncestor METHOD m_tkrkvrbe apply ()V METHOD m_upvmgssi arrangeForTree (Lnet/minecraft/unmapped/C_seqaydby;)V - METHOD m_xuurhqjn findChildrenRecursively (Lnet/minecraft/unmapped/C_seqaydby;Lnet/minecraft/unmapped/C_dqdihuga;)Lnet/minecraft/unmapped/C_dqdihuga; + ARG 0 root + METHOD m_xuurhqjn findChildRecursively (Lnet/minecraft/unmapped/C_seqaydby;Lnet/minecraft/unmapped/C_dqdihuga;)Lnet/minecraft/unmapped/C_dqdihuga; + ARG 1 node ARG 2 lastChild diff --git a/mappings/net/minecraft/advancement/AdvancementProgress.mapping b/mappings/net/minecraft/advancement/AdvancementProgress.mapping index 5453ee4ac5..c32bdcda36 100644 --- a/mappings/net/minecraft/advancement/AdvancementProgress.mapping +++ b/mappings/net/minecraft/advancement/AdvancementProgress.mapping @@ -1,26 +1,39 @@ CLASS net/minecraft/unmapped/C_rpzbknxp net/minecraft/advancement/AdvancementProgress + FIELD f_mhfgclex COMPLETED_TIME_FORMAT Ljava/time/format/DateTimeFormatter; FIELD f_mkjaxtuk requirements Lnet/minecraft/unmapped/C_wbfyxnvb; + FIELD f_ojpamimu CRITERIA_CODEC Lcom/mojang/serialization/Codec; + FIELD f_oqxaffnd CODEC Lcom/mojang/serialization/Codec; FIELD f_otlapbhr criteriaProgresses Ljava/util/Map; + FIELD f_tfwtcnnx COMPLETED_TIME_CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Map;)V ARG 1 criteriaProgresses METHOD compareTo compareTo (Ljava/lang/Object;)I - ARG 1 o + ARG 1 progress METHOD m_bzdhtbyp fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_rpzbknxp; ARG 0 buf METHOD m_cpbjharz reset (Ljava/lang/String;)Z - ARG 1 name + ARG 1 criterionName METHOD m_dbcilcfp getProgressBarPercentage ()F - METHOD m_dcbyaeuq isAnyObtained ()Z - METHOD m_epppddpz obtain (Ljava/lang/String;)Z - ARG 1 name + METHOD m_dcbyaeuq anyCriteriaComplete ()Z + METHOD m_epppddpz complete (Ljava/lang/String;)Z + ARG 1 criterionName + METHOD m_goyprwze (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_ieqlmftm;)V + ARG 1 progress + METHOD m_hfxdkjxc (Lnet/minecraft/unmapped/C_rpzbknxp;)Ljava/util/Map; + ARG 0 progress METHOD m_hjnaqzwo init (Lnet/minecraft/unmapped/C_wbfyxnvb;)V + ARG 1 requirements METHOD m_hyuuzqmm getCriterionProgress (Ljava/lang/String;)Lnet/minecraft/unmapped/C_ieqlmftm; - ARG 1 name - METHOD m_kxwhptqq isDone ()Z + ARG 1 criterionName + METHOD m_kxwhptqq isComplete ()Z METHOD m_kzhoujvd countObtainedRequirements ()I - METHOD m_nkqqucnn getObtainedCriteria ()Ljava/lang/Iterable; + METHOD m_lsxzrdww (Ljava/time/Instant;)Ljava/time/temporal/TemporalAccessor; + ARG 0 instant + METHOD m_nkqqucnn getCompletedCriteria ()Ljava/lang/Iterable; METHOD m_rzxbanct getProgressBarFraction ()Lnet/minecraft/unmapped/C_rdaqiwdt; - METHOD m_ugtyagjo getUnobtainedCriteria ()Ljava/lang/Iterable; + METHOD m_tzjkxqzv isComplete (Ljava/lang/String;)Z + ARG 1 criterion + METHOD m_ugtyagjo getIncompleteCriteria ()Ljava/lang/Iterable; METHOD m_uwumgwtz toPacket (Lnet/minecraft/unmapped/C_idfydwco;)V ARG 1 buf - METHOD m_vsrrtfha getEarliestProgressObtainDate ()Ljava/time/Instant; + METHOD m_vsrrtfha getEarliestProgressCompletedDate ()Ljava/time/Instant; diff --git a/mappings/net/minecraft/advancement/AdvancementRequirements.mapping b/mappings/net/minecraft/advancement/AdvancementRequirements.mapping new file mode 100644 index 0000000000..bd80d7d3bf --- /dev/null +++ b/mappings/net/minecraft/advancement/AdvancementRequirements.mapping @@ -0,0 +1,35 @@ +CLASS net/minecraft/unmapped/C_wbfyxnvb net/minecraft/advancement/AdvancementRequirements + FIELD f_tkcwteeq EMPTY Lnet/minecraft/unmapped/C_wbfyxnvb; + FIELD f_wauysoso requirements [[Ljava/lang/String; + METHOD m_ehrayjiz length ()I + METHOD m_goeproas (Ljava/lang/String;)[Ljava/lang/String; + ARG 0 string + METHOD m_gzkxpsoh anyMatch ([Ljava/lang/String;Ljava/util/function/Predicate;)Z + ARG 0 strings + ARG 1 predicate + METHOD m_hdmfabfc allMatch (Ljava/util/function/Predicate;)Z + ARG 1 predicate + METHOD m_hlutmmhm (I)[Ljava/lang/String; + ARG 0 i + METHOD m_jupbcyte anyOf (Ljava/util/Collection;)Lnet/minecraft/unmapped/C_wbfyxnvb; + ARG 0 collection + METHOD m_menihivh (I)[[Ljava/lang/String; + ARG 0 i + METHOD m_nxtypetc toSet ()Ljava/util/Set; + METHOD m_pkhatonp toPacket (Lnet/minecraft/unmapped/C_idfydwco;)V + METHOD m_scqgjsve toJsonArray ()Lcom/google/gson/JsonArray; + METHOD m_tvrlcuao allOf (Ljava/util/Collection;)Lnet/minecraft/unmapped/C_wbfyxnvb; + ARG 0 collection + METHOD m_wcrxarkq fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)[[Ljava/lang/String; + METHOD m_wotlwhna fromJson (Lcom/google/gson/JsonArray;Ljava/util/Set;)Lnet/minecraft/unmapped/C_wbfyxnvb; + ARG 0 jsonArray + ARG 1 expectedRequirements + METHOD m_xvzpcfxt empty ()Z + METHOD m_ypaiwcgh countMatches (Ljava/util/function/Predicate;)I + COMMENT Counts the amount of inner arrays that contain a {@link String} that matches the provided {@link Predicate}. + ARG 1 predicate + CLASS C_huwvdbdx RequirementMerger + FIELD f_kkwnhuse ALL Lnet/minecraft/unmapped/C_wbfyxnvb$C_huwvdbdx; + FIELD f_zvupbphi ANY Lnet/minecraft/unmapped/C_wbfyxnvb$C_huwvdbdx; + METHOD create create (Ljava/util/Collection;)Lnet/minecraft/unmapped/C_wbfyxnvb; + ARG 1 requirements diff --git a/mappings/net/minecraft/advancement/AdvancementTree.mapping b/mappings/net/minecraft/advancement/AdvancementTree.mapping new file mode 100644 index 0000000000..cc26ea9653 --- /dev/null +++ b/mappings/net/minecraft/advancement/AdvancementTree.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/unmapped/C_xhjcixzl net/minecraft/advancement/AdvancementTree + FIELD f_eogztskm listener Lnet/minecraft/unmapped/C_xhjcixzl$C_cpxypcvz; + FIELD f_gammkdxc nodes Ljava/util/Set; + FIELD f_hlhmokqq roots Ljava/util/Set; + FIELD f_wecownrc advancements Ljava/util/Map; + METHOD m_byneolpv getNodes ()Ljava/util/Collection; + METHOD m_diydrjiz remove (Ljava/util/Set;)V + ARG 1 advancements + METHOD m_escrjacq load (Lnet/minecraft/unmapped/C_unoypvme;)Z + ARG 1 advancementHolder + METHOD m_fnwytxqz setListener (Lnet/minecraft/unmapped/C_xhjcixzl$C_cpxypcvz;)V + ARG 1 listener + METHOD m_gpewmmmn get (Lnet/minecraft/unmapped/C_unoypvme;)Lnet/minecraft/unmapped/C_seqaydby; + ARG 1 advancementHolder + METHOD m_nihfoyom get (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_seqaydby; + ARG 1 id + METHOD m_rpmwszgm getRoots ()Ljava/lang/Iterable; + METHOD m_waaoeipi clear ()V + METHOD m_xbwtlqwu load (Ljava/util/Collection;)V + ARG 1 advancements + METHOD m_xnpcivmn removeRecursively (Lnet/minecraft/unmapped/C_seqaydby;)V + ARG 1 node + CLASS C_cpxypcvz NodeListener + METHOD m_cuzdpeka onRemoveTask (Lnet/minecraft/unmapped/C_seqaydby;)V + ARG 1 node + METHOD m_phmhpmip onAddRoot (Lnet/minecraft/unmapped/C_seqaydby;)V + ARG 1 node + METHOD m_ratyiacf onAddTask (Lnet/minecraft/unmapped/C_seqaydby;)V + ARG 1 node + METHOD m_yoncjcuz onClear ()V + METHOD m_zjkvbufe onRemoveRoot (Lnet/minecraft/unmapped/C_seqaydby;)V + ARG 1 node diff --git a/mappings/net/minecraft/advancement/AdvancementVisibilityEvaluator.mapping b/mappings/net/minecraft/advancement/AdvancementVisibilityEvaluator.mapping index 49d627d7e7..e690df6cd2 100644 --- a/mappings/net/minecraft/advancement/AdvancementVisibilityEvaluator.mapping +++ b/mappings/net/minecraft/advancement/AdvancementVisibilityEvaluator.mapping @@ -1,4 +1,24 @@ CLASS net/minecraft/unmapped/C_hrhneqyx net/minecraft/advancement/AdvancementVisibilityEvaluator - METHOD m_exegzdua (Lnet/minecraft/unmapped/C_kdwyuhdb;Z)Lnet/minecraft/unmapped/C_hrhneqyx$C_bfuhkkvt; + FIELD f_pzrjzres VISIBILITY_DEPTH I + METHOD m_caogvyis evaluateVisibility (Lnet/minecraft/unmapped/C_seqaydby;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_hrhneqyx$C_laxhphom;)V + ARG 0 node + ARG 1 visibilityPredicate + ARG 2 output + METHOD m_exegzdua getVisibility (Lnet/minecraft/unmapped/C_kdwyuhdb;Z)Lnet/minecraft/unmapped/C_hrhneqyx$C_bfuhkkvt; ARG 0 advancement ARG 1 alwaysShowIfPossible + METHOD m_ijazeico shouldShow (Lit/unimi/dsi/fastutil/Stack;)Z + ARG 0 visibilityStack + METHOD m_uejetdwx evaluateVisibilityRecursively (Lnet/minecraft/unmapped/C_seqaydby;Lit/unimi/dsi/fastutil/Stack;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_hrhneqyx$C_laxhphom;)Z + ARG 0 node + ARG 1 visibilityStack + ARG 2 visibilityPredicate + ARG 3 output + CLASS C_bfuhkkvt Visibility + FIELD f_oxtroszl NO_CHANGE Lnet/minecraft/unmapped/C_hrhneqyx$C_bfuhkkvt; + FIELD f_vnsqmynm SHOW Lnet/minecraft/unmapped/C_hrhneqyx$C_bfuhkkvt; + FIELD f_wpaygqgi HIDE Lnet/minecraft/unmapped/C_hrhneqyx$C_bfuhkkvt; + CLASS C_laxhphom Output + METHOD accept accept (Lnet/minecraft/unmapped/C_seqaydby;Z)V + ARG 1 node + ARG 2 shouldShow diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index da4e7462e1..f547f692b6 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -4,11 +4,14 @@ CLASS net/minecraft/unmapped/C_hyeqtgvx net/minecraft/advancement/PlayerAdvancem FIELD f_gjxxqvop LOGGER Lorg/slf4j/Logger; FIELD f_heqienju playerManager Lnet/minecraft/unmapped/C_digmgtxw; FIELD f_irznbzby owner Lnet/minecraft/unmapped/C_mxrobsgg; + FIELD f_ivqxewak nodes Ljava/util/Set; FIELD f_jehxxcjj advancementProgresses Ljava/util/Map; FIELD f_sikjpymk dirty Z FIELD f_slcbnkdg visibleAdvancements Ljava/util/Set; FIELD f_tjxvxhib progressUpdates Ljava/util/Set; FIELD f_tmfkznzu currentDisplayTab Lnet/minecraft/unmapped/C_unoypvme; + FIELD f_vvrvziqs tree Lnet/minecraft/unmapped/C_xhjcixzl; + FIELD f_wylfyffs codec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/unmapped/C_digmgtxw;Lnet/minecraft/unmapped/C_fktoyupt;Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_mxrobsgg;)V ARG 1 dataFixer ARG 2 playerManager @@ -16,25 +19,69 @@ CLASS net/minecraft/unmapped/C_hyeqtgvx net/minecraft/advancement/PlayerAdvancem ARG 4 advancementsSaveFile ARG 5 owner METHOD m_awiiutgo revokeCriterion (Lnet/minecraft/unmapped/C_unoypvme;Ljava/lang/String;)Z + ARG 1 advancement ARG 2 criterionName METHOD m_beumusmu setDisplayTab (Lnet/minecraft/unmapped/C_unoypvme;)V + ARG 1 holder METHOD m_blqhkaiq clearCriteria ()V - METHOD m_bucnvzph endTrackingCompleted (Lnet/minecraft/unmapped/C_unoypvme;)V + METHOD m_bucnvzph endTracking (Lnet/minecraft/unmapped/C_unoypvme;)V + ARG 1 advancementHolder + METHOD m_czdclwkv updateVisibility (Lnet/minecraft/unmapped/C_seqaydby;Ljava/util/Set;Ljava/util/Set;)V + ARG 1 root + ARG 2 visibleAdvancements + ARG 3 hiddenAdvancements METHOD m_ecvsrmhv sendUpdate (Lnet/minecraft/unmapped/C_mxrobsgg;)V ARG 1 player + METHOD m_flsopqse (Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_bvqakncm;)V + ARG 2 display + METHOD m_fzsuujvd (Ljava/util/Map;Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_rpzbknxp;)V + ARG 1 advancement + ARG 2 progress METHOD m_guemlutk rewardEmptyAdvancements (Lnet/minecraft/unmapped/C_fktoyupt;)V ARG 1 advancementLoader + METHOD m_iaanlovn (Lnet/minecraft/unmapped/C_fktoyupt;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_rpzbknxp;)V + ARG 2 advancementId + ARG 3 progress METHOD m_jgahcliw reload (Lnet/minecraft/unmapped/C_fktoyupt;)V ARG 1 advancementLoader METHOD m_kgpamevw getProgress (Lnet/minecraft/unmapped/C_unoypvme;)Lnet/minecraft/unmapped/C_rpzbknxp; + ARG 1 holder METHOD m_lcsyawvb setOwner (Lnet/minecraft/unmapped/C_mxrobsgg;)V ARG 1 owner METHOD m_pfzhwboq initProgress (Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_rpzbknxp;)V + ARG 1 advancementHolder ARG 2 progress + METHOD m_pjrrhgbk load (Lnet/minecraft/unmapped/C_fktoyupt;Lnet/minecraft/unmapped/C_hyeqtgvx$C_tpewgfns;)V + ARG 1 serverAdvancementLoader + ARG 2 data + METHOD m_pptrdaxw add (Lnet/minecraft/unmapped/C_unoypvme;)V + ARG 1 advancement + METHOD m_qrcupvar endTracking (Lnet/minecraft/unmapped/C_unoypvme;Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)V + ARG 1 advancement + ARG 2 name + ARG 3 criterion + METHOD m_qvumkguv data ()Lnet/minecraft/unmapped/C_hyeqtgvx$C_tpewgfns; METHOD m_rsgkbelj load (Lnet/minecraft/unmapped/C_fktoyupt;)V ARG 1 advancementLoader + METHOD m_wahppvup (Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/unmapped/C_seqaydby;Z)V + ARG 3 node + ARG 4 shouldShow + METHOD m_xffosjia beginTracking (Lnet/minecraft/unmapped/C_unoypvme;)V + ARG 1 advancement METHOD m_yjaqlufb beginTrackingAllAdvancements (Lnet/minecraft/unmapped/C_fktoyupt;)V ARG 1 advancementLoader METHOD m_ywfhjcpi grantCriterion (Lnet/minecraft/unmapped/C_unoypvme;Ljava/lang/String;)Z + ARG 1 advancement ARG 2 criterionName + METHOD m_zebsrcbw beginTracking (Lnet/minecraft/unmapped/C_unoypvme;Ljava/lang/String;Lnet/minecraft/unmapped/C_rzypsigz;)V + ARG 1 advancement + ARG 2 name + ARG 3 criterion METHOD m_zrnhuclw save ()V + CLASS C_tpewgfns Data + FIELD f_tnidkppv map Ljava/util/Map; + METHOD m_etgdpzmk map ()Ljava/util/Map; + METHOD m_pfrdizzn forEach (Ljava/util/function/BiConsumer;)V + ARG 1 biConsumer + METHOD m_sjgjbuba (Ljava/util/function/BiConsumer;Ljava/util/Map$Entry;)V + ARG 1 entry diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping deleted file mode 100644 index 83dd87937a..0000000000 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/unmapped/C_bmtrgtzi net/minecraft/advancement/criterion/AbstractCriterion - FIELD f_ssfbtyrg progressions Ljava/util/Map; - METHOD m_fnnxwhdy trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/util/function/Predicate;)V - ARG 1 player - ARG 2 predicate - METHOD m_whzofkzk (Lnet/minecraft/unmapped/C_hyeqtgvx;)Ljava/util/Set; - ARG 0 manager diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping index 02ac9a6864..1838e4371a 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping @@ -1,2 +1,6 @@ CLASS net/minecraft/unmapped/C_ihqmwirx net/minecraft/advancement/criterion/AbstractCriterionConditions FIELD f_rljjaeer playerPredicate Ljava/util/Optional; + METHOD (Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_obozjiqj (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionTrigger.mapping new file mode 100644 index 0000000000..5f33c630d1 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionTrigger.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/unmapped/C_bmtrgtzi net/minecraft/advancement/criterion/AbstractCriterionTrigger + FIELD f_ssfbtyrg progressions Ljava/util/Map; + METHOD m_ekiuzjie createConditions (Lcom/google/gson/JsonObject;Ljava/util/Optional;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_bmtrgtzi$C_hjljikdm; + ARG 1 json + ARG 2 playerPredicate + ARG 3 deserializer + METHOD m_fnnxwhdy trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/util/function/Predicate;)V + ARG 1 player + ARG 2 predicate + METHOD m_whzofkzk (Lnet/minecraft/unmapped/C_hyeqtgvx;)Ljava/util/Set; + ARG 0 manager + CLASS C_hjljikdm Conditions + METHOD m_cbcfqqmr getPlayerPredicate ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.mapping similarity index 71% rename from mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.mapping index 20a84ccb64..210a9060a5 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_eyqqwstf net/minecraft/advancement/criterion/BeeNestDestroyedCriterion +CLASS net/minecraft/unmapped/C_eyqqwstf net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger METHOD m_lrxipyin getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_mmxmpdoq; ARG 0 root METHOD m_slfawnwz trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_sddaxwyk;I)V @@ -12,11 +12,15 @@ CLASS net/minecraft/unmapped/C_eyqqwstf net/minecraft/advancement/criterion/BeeN FIELD f_beqjwoos item Ljava/util/Optional; FIELD f_fzyfukht beeCount Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; FIELD f_iaebcety block Lnet/minecraft/unmapped/C_mmxmpdoq; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V + ARG 1 playerPredicate + METHOD m_dqbbkvgn (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item METHOD m_gxuzlxbe create (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 block ARG 1 itemPredicateBuilder ARG 2 beeCountRange - METHOD m_jprnzaoc test (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_sddaxwyk;I)Z + METHOD m_jprnzaoc matches (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_sddaxwyk;I)Z ARG 1 state ARG 2 stack ARG 3 count diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping deleted file mode 100644 index 4cab66d65b..0000000000 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/unmapped/C_mvevuwjm net/minecraft/advancement/criterion/BredAnimalsCriterion - METHOD m_qqsdqghb (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_mvevuwjm$C_avoywuag;)Z - ARG 3 conditions - METHOD m_sylenjvq trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_tprvtfff;Lnet/minecraft/unmapped/C_tprvtfff;Lnet/minecraft/unmapped/C_jvojbnla;)V - ARG 1 player - ARG 2 parent - ARG 3 partner - ARG 4 child - CLASS C_avoywuag Conditions - FIELD f_aohytflc parent Ljava/util/Optional; - FIELD f_conlcaee partner Ljava/util/Optional; - FIELD f_uabdygbc child Ljava/util/Optional; diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.mapping new file mode 100644 index 0000000000..cd7437aa52 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.mapping @@ -0,0 +1,34 @@ +CLASS net/minecraft/unmapped/C_mvevuwjm net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger + METHOD m_qqsdqghb (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_mvevuwjm$C_avoywuag;)Z + ARG 3 conditions + METHOD m_sylenjvq trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_tprvtfff;Lnet/minecraft/unmapped/C_tprvtfff;Lnet/minecraft/unmapped/C_jvojbnla;)V + ARG 1 player + ARG 2 parent + ARG 3 partner + ARG 4 child + CLASS C_avoywuag Conditions + FIELD f_aohytflc parent Ljava/util/Optional; + FIELD f_conlcaee partner Ljava/util/Optional; + FIELD f_uabdygbc child Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_gbsmmkyu (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 child + METHOD m_lgwtsxop create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 parent + ARG 1 partner + ARG 2 child + METHOD m_pavxypol (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 partner + METHOD m_pkomrmfh matches (Ljava/util/Optional;Lnet/minecraft/unmapped/C_iakykpgh;)Z + ARG 0 playerPredicate + ARG 1 lootContext + METHOD m_rwdliwdp create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 childBuilder + METHOD m_soempetz matches (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;)Z + ARG 1 parentLootContext + ARG 2 partnerLootContext + ARG 3 childLootContext + METHOD m_spmdtxhy (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 parent + METHOD m_tslxiglw create ()Lnet/minecraft/unmapped/C_rzypsigz; diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.mapping similarity index 70% rename from mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.mapping index 5fb4acc5ab..dd9cde7697 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_opfhzgki net/minecraft/advancement/criterion/BrewedPotionCriterion +CLASS net/minecraft/unmapped/C_opfhzgki net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger METHOD m_ivsfhxuc (Lnet/minecraft/unmapped/C_almkolgw;Lnet/minecraft/unmapped/C_opfhzgki$C_nhlhuijz;)Z ARG 1 conditions METHOD m_jlnjsigz trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_almkolgw;)V @@ -6,6 +6,8 @@ CLASS net/minecraft/unmapped/C_opfhzgki net/minecraft/advancement/criterion/Brew ARG 2 potion CLASS C_nhlhuijz Conditions FIELD f_stylqccy potion Lnet/minecraft/unmapped/C_almkolgw; - METHOD m_nwhpawqe any ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_almkolgw;)V + ARG 1 playerPredicate + METHOD m_nwhpawqe create ()Lnet/minecraft/unmapped/C_rzypsigz; METHOD m_smuruvko matches (Lnet/minecraft/unmapped/C_almkolgw;)Z ARG 1 potion diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.mapping similarity index 52% rename from mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.mapping index 943c63cbe5..6941fc9c22 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_nxnnvhrs net/minecraft/advancement/criterion/ChangedDimensionCriterion +CLASS net/minecraft/unmapped/C_nxnnvhrs net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger METHOD m_jffihzld (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nxnnvhrs$C_zmkqrnzi;)Z ARG 2 conditions METHOD m_romevwgc trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;)V @@ -8,10 +8,16 @@ CLASS net/minecraft/unmapped/C_nxnnvhrs net/minecraft/advancement/criterion/Chan CLASS C_zmkqrnzi Conditions FIELD f_ccpgpiel from Lnet/minecraft/unmapped/C_xhhleach; FIELD f_gbjxmcrt to Lnet/minecraft/unmapped/C_xhhleach; - METHOD m_jmncpaoi to (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 playerPredicate + METHOD m_adljdsut createBetween (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 to + ARG 1 from + METHOD m_jmncpaoi createTo (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 to METHOD m_mxtpzfbr matches (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;)Z ARG 1 from ARG 2 to - METHOD m_srrqhbtw from (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_srrqhbtw createFrom (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 from + METHOD m_xxwoiigy create ()Lnet/minecraft/unmapped/C_rzypsigz; diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.mapping similarity index 82% rename from mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.mapping index 0309a9b64b..5f53f607db 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_ekmkxenz net/minecraft/advancement/criterion/ChanneledLightningCriterion +CLASS net/minecraft/unmapped/C_ekmkxenz net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger METHOD m_lymxckke trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/util/Collection;)V ARG 1 player ARG 2 victims @@ -8,6 +8,9 @@ CLASS net/minecraft/unmapped/C_ekmkxenz net/minecraft/advancement/criterion/Chan ARG 1 entity CLASS C_hbabyqbh Conditions FIELD f_jyomajaq victims Ljava/util/List; + METHOD (Ljava/util/Optional;Ljava/util/List;)V + ARG 1 playerPredicate METHOD m_dfanmuvv matches (Ljava/util/Collection;)Z ARG 1 victims METHOD m_voeplsts create ([Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builders diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.mapping similarity index 53% rename from mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.mapping index 6f4643cc1c..5496342291 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_bbkpvqdm net/minecraft/advancement/criterion/ConstructBeaconCriterion +CLASS net/minecraft/unmapped/C_bbkpvqdm net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger METHOD m_lfoqjpps (ILnet/minecraft/unmapped/C_bbkpvqdm$C_enauomuk;)Z ARG 1 conditions METHOD m_mubmogbu trigger (Lnet/minecraft/unmapped/C_mxrobsgg;I)V @@ -6,5 +6,10 @@ CLASS net/minecraft/unmapped/C_bbkpvqdm net/minecraft/advancement/criterion/Cons ARG 2 level CLASS C_enauomuk Conditions FIELD f_rfiptnjd level Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V + ARG 1 playerPredicate METHOD m_doftumqx matches (I)Z ARG 1 level + METHOD m_lqdrqdwc create (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 range + METHOD m_qhpglljw create ()Lnet/minecraft/unmapped/C_rzypsigz; diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping deleted file mode 100644 index 4633d6d779..0000000000 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/unmapped/C_jffbmlem net/minecraft/advancement/criterion/ConsumeItemCriterion - METHOD m_gitxmsbe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jffbmlem$C_bzfkzlig;)Z - ARG 1 conditions - METHOD m_jujntqot trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;)V - ARG 1 player - ARG 2 stack - CLASS C_bzfkzlig Conditions - FIELD f_wzmmnlpm item Ljava/util/Optional; - METHOD m_ouevtdvp matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.mapping new file mode 100644 index 0000000000..4413b13a71 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/unmapped/C_jffbmlem net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger + METHOD m_gitxmsbe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jffbmlem$C_bzfkzlig;)Z + ARG 1 conditions + METHOD m_jujntqot trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;)V + ARG 1 player + ARG 2 stack + CLASS C_bzfkzlig Conditions + FIELD f_wzmmnlpm item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_bnfgwlrc create ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_gvfxortg (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item + METHOD m_jaokbhfr create (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder + METHOD m_ouevtdvp matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z + ARG 1 stack + METHOD m_vhyjraam create (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 137b2e5c44..5d46dd0496 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -54,6 +54,9 @@ CLASS net/minecraft/unmapped/C_hmkjzbjo net/minecraft/advancement/criterion/Crit FIELD f_zwqdoouy VILLAGER_TRADE Lnet/minecraft/unmapped/C_yddyhqpp; METHOD m_empkloof getCriteria ()Ljava/lang/Iterable; METHOD m_iyxgljbn register (Ljava/lang/String;Lnet/minecraft/unmapped/C_mysyaxfs;)Lnet/minecraft/unmapped/C_mysyaxfs; + ARG 0 id ARG 1 object + METHOD m_jholjlqo getId (Lnet/minecraft/unmapped/C_mysyaxfs;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 criterion METHOD m_usbmpwkz getById (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_mysyaxfs; ARG 0 id diff --git a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping index 6430168b11..a4cdf35893 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/unmapped/C_ieqlmftm net/minecraft/advancement/criterion/CriterionProgress - FIELD f_zpctmwhg obtainedDate Ljava/time/Instant; + FIELD f_zpctmwhg completedDate Ljava/time/Instant; METHOD m_dbjakwxl reset ()V - METHOD m_mzajlowr getObtainedDate ()Ljava/time/Instant; - METHOD m_nrqninpc obtain ()V + METHOD m_mzajlowr getCompletedDate ()Ljava/time/Instant; + METHOD m_nrqninpc complete ()V METHOD m_oxlmapia toPacket (Lnet/minecraft/unmapped/C_idfydwco;)V ARG 1 buf - METHOD m_zligpjgt isObtained ()Z + METHOD m_zligpjgt isComplete ()Z METHOD m_zxjdbfss fromPacket (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_ieqlmftm; ARG 0 buf diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/CriterionTrigger.mapping similarity index 74% rename from mappings/net/minecraft/advancement/criterion/Criterion.mapping rename to mappings/net/minecraft/advancement/criterion/CriterionTrigger.mapping index 31d17c20ce..0734aff371 100644 --- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionTrigger.mapping @@ -1,6 +1,8 @@ -CLASS net/minecraft/unmapped/C_mysyaxfs net/minecraft/advancement/criterion/Criterion +CLASS net/minecraft/unmapped/C_mysyaxfs net/minecraft/advancement/criterion/CriterionTrigger + METHOD m_eenzxdpn create (Lnet/minecraft/unmapped/C_zkhebbek;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 1 conditions METHOD m_ejusorzh conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_zkhebbek; - ARG 1 obj + ARG 1 json ARG 2 predicateDeserializer METHOD m_lpffuyki beginTrackingCondition (Lnet/minecraft/unmapped/C_hyeqtgvx;Lnet/minecraft/unmapped/C_mysyaxfs$C_lklaplvi;)V ARG 1 manager @@ -16,5 +18,8 @@ CLASS net/minecraft/unmapped/C_mysyaxfs net/minecraft/advancement/criterion/Crit FIELD f_yyoplbkd id Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 1 o + METHOD m_emdqksfu conditions ()Lnet/minecraft/unmapped/C_zkhebbek; + METHOD m_hcbwhlmb id ()Ljava/lang/String; METHOD m_retgphks grant (Lnet/minecraft/unmapped/C_hyeqtgvx;)V ARG 1 tracker + METHOD m_xmxdnihr advancement ()Lnet/minecraft/unmapped/C_unoypvme; diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.mapping similarity index 51% rename from mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.mapping index 0bbac309a6..1a16837acd 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_urcewduq net/minecraft/advancement/criterion/CuredZombieVillagerCriterion +CLASS net/minecraft/unmapped/C_urcewduq net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger METHOD m_amvzzejn trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_hlzqkibq;Lnet/minecraft/unmapped/C_pdtkdbte;)V ARG 1 player ARG 2 zombie @@ -6,9 +6,15 @@ CLASS net/minecraft/unmapped/C_urcewduq net/minecraft/advancement/criterion/Cure METHOD m_zjvefmwh (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_urcewduq$C_izcpkdrl;)Z ARG 2 conditions CLASS C_izcpkdrl Conditions - FIELD f_fsqsxjac villager Ljava/util/Optional; - FIELD f_rcgapqtf zombie Ljava/util/Optional; - METHOD m_bmzrgsol any ()Lnet/minecraft/unmapped/C_rzypsigz; + FIELD f_fsqsxjac villagerPredicate Ljava/util/Optional; + FIELD f_rcgapqtf zombiePredicate Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_bmzrgsol create ()Lnet/minecraft/unmapped/C_rzypsigz; METHOD m_gshltfwj matches (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;)Z ARG 1 zombieContext ARG 2 villagerContext + METHOD m_lmspjxqm (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 zombie + METHOD m_ptrjqhox (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 villager diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping deleted file mode 100644 index 5cde0906be..0000000000 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/unmapped/C_frltmexa net/minecraft/advancement/criterion/EffectsChangedCriterion - METHOD m_kkmvxrvj (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_frltmexa$C_nuklejcd;)Z - ARG 2 conditions - METHOD m_mxsirqwg trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;)V - ARG 1 player - ARG 2 source - CLASS C_nuklejcd Conditions - FIELD f_mrkuerej effects Ljava/util/Optional; - FIELD f_rzrdetbl source Ljava/util/Optional; - METHOD m_nhgylwru create (Lnet/minecraft/unmapped/C_nysuqcvh$C_tmpwnbuk;)Lnet/minecraft/unmapped/C_rzypsigz; - METHOD m_okchwupq matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;)Z - ARG 1 player - ARG 2 context - METHOD m_yaktkwvf create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.mapping new file mode 100644 index 0000000000..bd1cdc61d7 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/unmapped/C_frltmexa net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger + METHOD m_kkmvxrvj (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_frltmexa$C_nuklejcd;)Z + ARG 2 conditions + METHOD m_mxsirqwg trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;)V + ARG 1 player + ARG 2 source + CLASS C_nuklejcd Conditions + FIELD f_mrkuerej effects Ljava/util/Optional; + FIELD f_rzrdetbl source Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_jpfmhpzm (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 source + METHOD m_nhgylwru createEffects (Lnet/minecraft/unmapped/C_nysuqcvh$C_tmpwnbuk;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder + METHOD m_okchwupq matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;)Z + ARG 1 player + ARG 2 context + METHOD m_wbfusqkm (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_nysuqcvh;)V + ARG 1 effects + METHOD m_yaktkwvf createSource (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.mapping similarity index 63% rename from mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.mapping index 5eb713f6bf..5bd264a333 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_sszdquwf net/minecraft/advancement/criterion/EnchantedItemCriterion +CLASS net/minecraft/unmapped/C_sszdquwf net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger METHOD m_lbwbownu (Lnet/minecraft/unmapped/C_sddaxwyk;ILnet/minecraft/unmapped/C_sszdquwf$C_kscasjsf;)Z ARG 2 conditions METHOD m_ntvpuhhm trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;I)V @@ -8,7 +8,11 @@ CLASS net/minecraft/unmapped/C_sszdquwf net/minecraft/advancement/criterion/Ench CLASS C_kscasjsf Conditions FIELD f_beglylru levels Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; FIELD f_vafjxlah item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V + ARG 1 playerPredicate METHOD m_sinvrewi matches (Lnet/minecraft/unmapped/C_sddaxwyk;I)Z ARG 1 stack ARG 2 levels - METHOD m_ucqnhtpz any ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_ucqnhtpz create ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_vxiaigtu (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping deleted file mode 100644 index aedb54e44b..0000000000 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/unmapped/C_rvwlswnk net/minecraft/advancement/criterion/EnterBlockCriterion - METHOD m_uxhlakjj (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/String;)V - ARG 1 name - METHOD m_vcjsvzsc getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_mmxmpdoq; - ARG 0 obj - METHOD m_vfmlslzb trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_txtbiemp;)V - ARG 1 player - ARG 2 state - CLASS C_fcmyqfbr Conditions - FIELD f_xkcfevos state Ljava/util/Optional; - FIELD f_yihynpxv block Lnet/minecraft/unmapped/C_mmxmpdoq; - METHOD m_iomnpyzy block (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_rzypsigz; - ARG 0 block - METHOD m_jihxqndx matches (Lnet/minecraft/unmapped/C_txtbiemp;)Z - ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.mapping new file mode 100644 index 0000000000..8a9b6231c3 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/unmapped/C_rvwlswnk net/minecraft/advancement/criterion/EnterBlockCriterionTrigger + METHOD m_goaksfjy (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rvwlswnk$C_fcmyqfbr;)Z + ARG 1 conditions + METHOD m_sylauxkd (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_fsjpkzrx;)V + ARG 1 statePredicate + METHOD m_uxhlakjj (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/String;)V + ARG 1 name + METHOD m_vcjsvzsc getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_mmxmpdoq; + ARG 0 json + METHOD m_vfmlslzb trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_txtbiemp;)V + ARG 1 player + ARG 2 state + CLASS C_fcmyqfbr Conditions + FIELD f_xkcfevos state Ljava/util/Optional; + FIELD f_yihynpxv block Lnet/minecraft/unmapped/C_mmxmpdoq; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_iomnpyzy create (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 block + METHOD m_jihxqndx matches (Lnet/minecraft/unmapped/C_txtbiemp;)Z + ARG 1 state + METHOD m_zxgcqeln (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_fsjpkzrx;)V + ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.mapping similarity index 55% rename from mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.mapping index 5ec7c637ff..6f5c4c2224 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_vteznemu net/minecraft/advancement/criterion/EntityHurtPlayerCriterion +CLASS net/minecraft/unmapped/C_vteznemu net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger METHOD m_acjmihbu trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)V ARG 1 player ARG 2 source @@ -9,9 +9,18 @@ CLASS net/minecraft/unmapped/C_vteznemu net/minecraft/advancement/criterion/Enti ARG 5 conditions CLASS C_qcrjsemd Conditions FIELD f_xvxndxmn damage Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_ckqvihhp create (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 damage + METHOD m_clxrlnnj (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_mzdoirue;)V + ARG 1 damage METHOD m_gztunifz matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)Z ARG 1 player ARG 2 source ARG 3 dealt ARG 4 taken ARG 5 blocked + METHOD m_tunbavbi create (Lnet/minecraft/unmapped/C_mzdoirue;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 damage + METHOD m_wrrkjjlx create ()Lnet/minecraft/unmapped/C_rzypsigz; diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.mapping similarity index 70% rename from mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.mapping index e716439aa1..85b17baa6a 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_mhaudtdi net/minecraft/advancement/criterion/FilledBucketCriterion +CLASS net/minecraft/unmapped/C_mhaudtdi net/minecraft/advancement/criterion/FilledBucketCriterionTrigger METHOD m_mqinlrwx trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 player ARG 2 stack @@ -6,6 +6,11 @@ CLASS net/minecraft/unmapped/C_mhaudtdi net/minecraft/advancement/criterion/Fill ARG 1 conditions CLASS C_ewggyutx Conditions FIELD f_ypnyleyp item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_drifxqif (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item METHOD m_ysuegidl matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack METHOD m_zksotfnm create (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.mapping similarity index 80% rename from mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.mapping index 349acd7393..54cc7abca3 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_wpdvydim net/minecraft/advancement/criterion/FishingRodHookedCriterion +CLASS net/minecraft/unmapped/C_wpdvydim net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger METHOD m_ahsohtvs (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/Collection;Lnet/minecraft/unmapped/C_wpdvydim$C_mnduyaqi;)Z ARG 3 conditions METHOD m_rtjakuho trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_bgaroumb;Ljava/util/Collection;)V @@ -10,7 +10,12 @@ CLASS net/minecraft/unmapped/C_wpdvydim net/minecraft/advancement/criterion/Fish FIELD f_nhiyipvg hookedEntity Ljava/util/Optional; FIELD f_nyxgezpg rod Ljava/util/Optional; FIELD f_yxngcsqu caughtItem Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_getqiwnh create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 rod + ARG 1 hookedEntity + ARG 2 caughtItem METHOD m_lwkpspkx matches (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/Collection;)Z ARG 1 rod ARG 2 hookedEntityContext diff --git a/mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ImpossibleCriterionTrigger.mapping similarity index 70% rename from mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/ImpossibleCriterionTrigger.mapping index 199e07e3d8..270086054a 100644 --- a/mappings/net/minecraft/advancement/criterion/ImpossibleCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ImpossibleCriterionTrigger.mapping @@ -1,2 +1,2 @@ -CLASS net/minecraft/unmapped/C_hzboreux net/minecraft/advancement/criterion/ImpossibleCriterion +CLASS net/minecraft/unmapped/C_hzboreux net/minecraft/advancement/criterion/ImpossibleCriterionTrigger CLASS C_khtekqja Conditions diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.mapping similarity index 64% rename from mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.mapping index 9e48d91473..9a3272d9f8 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_wqesddch net/minecraft/advancement/criterion/InventoryChangedCriterion +CLASS net/minecraft/unmapped/C_wqesddch net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger METHOD m_hhvluxcz (Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_sddaxwyk;IIILnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf;)Z ARG 5 conditions METHOD m_kgcobihw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -17,9 +17,17 @@ CLASS net/minecraft/unmapped/C_wqesddch net/minecraft/advancement/criterion/Inve FIELD f_gcnlnbms empty Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; FIELD f_hbosewcb items Ljava/util/List; FIELD f_hugpsiii occupied Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/util/List;)V + ARG 1 playerPredicate METHOD m_aucajtyt matches (Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_sddaxwyk;III)Z ARG 1 inventory ARG 2 stack ARG 3 full ARG 4 empty ARG 5 occupied + METHOD m_gpaduibw create ([Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builders + METHOD m_jqkxsium create ([Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 items + METHOD m_vsjhnjag create ([Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 items diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping deleted file mode 100644 index dfff9a6be4..0000000000 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/unmapped/C_ekwvzgfo net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion - METHOD m_lmeuyups (Lnet/minecraft/unmapped/C_sddaxwyk;ILnet/minecraft/unmapped/C_ekwvzgfo$C_sjpvdygp;)Z - ARG 2 conditions - METHOD m_szsotskc trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;I)V - ARG 1 player - ARG 2 stack - ARG 3 durability - CLASS C_sjpvdygp Conditions - FIELD f_gjjbtgug item Ljava/util/Optional; - FIELD f_ndpumhnp delta Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_vwarbpen durability Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - METHOD m_hoaqsvtu matches (Lnet/minecraft/unmapped/C_sddaxwyk;I)Z - ARG 1 stack - ARG 2 durability diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.mapping new file mode 100644 index 0000000000..07296c3fa1 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/unmapped/C_ekwvzgfo net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger + METHOD m_lmeuyups (Lnet/minecraft/unmapped/C_sddaxwyk;ILnet/minecraft/unmapped/C_ekwvzgfo$C_sjpvdygp;)Z + ARG 2 conditions + METHOD m_szsotskc trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;I)V + ARG 1 player + ARG 2 stack + ARG 3 durability + CLASS C_sjpvdygp Conditions + FIELD f_gjjbtgug item Ljava/util/Optional; + FIELD f_ndpumhnp delta Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; + FIELD f_vwarbpen durability Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V + ARG 1 playerPredicate + METHOD m_hoaqsvtu matches (Lnet/minecraft/unmapped/C_sddaxwyk;I)Z + ARG 1 stack + ARG 2 durability + METHOD m_pxxqscii create (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 playerPredicate + ARG 1 item + ARG 2 durability + METHOD m_wwmesiog (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item + METHOD m_ystasjmm create (Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item + ARG 1 durability diff --git a/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.mapping deleted file mode 100644 index 60e6761d09..0000000000 --- a/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/unmapped/C_bvrmpowj net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion - METHOD m_akctuccp trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;)V - ARG 1 player - CLASS C_theveemg Conditions diff --git a/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.mapping new file mode 100644 index 0000000000..d520ee2a36 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/unmapped/C_bvrmpowj net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger + METHOD m_akctuccp trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;)V + ARG 1 player + METHOD m_vunuxwmc (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_bvrmpowj$C_theveemg;)Z + ARG 1 conditions + CLASS C_theveemg Conditions + FIELD f_tiwhehcd location Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_bnnjqxwe createAllayDropItemOnBlock (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 location + ARG 1 item + METHOD m_llhfwrlp matches (Lnet/minecraft/unmapped/C_iakykpgh;)Z + ARG 1 lootContext + METHOD m_nzqiyvyf create ([Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builders + METHOD m_qeequwzd (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 location + METHOD m_rvjgbvha create (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_skgrrvto create (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_bvrmpowj$C_theveemg; + ARG 0 location + ARG 1 item + METHOD m_ttkuarch createUseOnBlock (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 location + ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.mapping similarity index 57% rename from mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.mapping index 8eb3238714..3a7e885325 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_thhqzygp net/minecraft/advancement/criterion/KilledByCrossbowCriterion +CLASS net/minecraft/unmapped/C_thhqzygp net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger METHOD m_nzmzellz trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/util/Collection;)V ARG 1 player ARG 2 piercingKilledEntities @@ -7,6 +7,12 @@ CLASS net/minecraft/unmapped/C_thhqzygp net/minecraft/advancement/criterion/Kill CLASS C_jbfosyao Conditions FIELD f_vlrsamdh uniqueEntityTypes Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; FIELD f_zeikxwwf victims Ljava/util/List; + METHOD (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V + ARG 1 playerPredicate METHOD m_bucrxpgl matches (Ljava/util/Collection;I)Z ARG 1 victimContexts ARG 2 uniqueEntityTypeCount + METHOD m_hgdnexqb create (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 uniqueEntityTypes + METHOD m_sqvintkl create ([Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 victims diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterionTrigger.mapping similarity index 74% rename from mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/LevitationCriterionTrigger.mapping index 049cdaac43..e19be5d149 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_mhjgbxyr net/minecraft/advancement/criterion/LevitationCriterion +CLASS net/minecraft/unmapped/C_mhjgbxyr net/minecraft/advancement/criterion/LevitationCriterionTrigger METHOD m_hqqacnkj (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vgpupfxx;ILnet/minecraft/unmapped/C_mhjgbxyr$C_kxdzjcen;)Z ARG 3 conditions METHOD m_izixbtzz trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vgpupfxx;I)V @@ -8,9 +8,13 @@ CLASS net/minecraft/unmapped/C_mhjgbxyr net/minecraft/advancement/criterion/Levi CLASS C_kxdzjcen Conditions FIELD f_hybrirfi distance Ljava/util/Optional; FIELD f_kwnokhux duration Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V + ARG 1 playerPredicate METHOD m_ckluwaem matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vgpupfxx;I)Z ARG 1 player ARG 2 startPos ARG 3 duration + METHOD m_mgvixmcn (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ullximxc;)V + ARG 1 distance METHOD m_tmharzxo create (Lnet/minecraft/unmapped/C_ullximxc;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 distance diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.mapping similarity index 53% rename from mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.mapping index efc8e7d812..50772958da 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_ujdwetcx net/minecraft/advancement/criterion/LightningStrikeCriterion +CLASS net/minecraft/unmapped/C_ujdwetcx net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger METHOD m_dwrhsfcc trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_kbpqznyn;Ljava/util/List;)V ARG 1 player ARG 2 lightning @@ -10,6 +10,15 @@ CLASS net/minecraft/unmapped/C_ujdwetcx net/minecraft/advancement/criterion/Ligh CLASS C_nyevovia Conditions FIELD f_hvjdwveg lightning Ljava/util/Optional; FIELD f_ohpkesnc bystander Ljava/util/Optional; - METHOD m_qfdfliwp test (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/List;)Z + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_axcaiwko (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 lightning + METHOD m_murczras create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 lightning + ARG 1 bystander + METHOD m_qfdfliwp matches (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/List;)Z ARG 1 lightning ARG 2 bystanders + METHOD m_uukdwrnd (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 bystander diff --git a/mappings/net/minecraft/advancement/criterion/LocationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LocationCriterionTrigger.mapping similarity index 58% rename from mappings/net/minecraft/advancement/criterion/LocationCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/LocationCriterionTrigger.mapping index def3cb50e7..8723f61201 100644 --- a/mappings/net/minecraft/advancement/criterion/LocationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LocationCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_maikngon net/minecraft/advancement/criterion/LocationCriterion +CLASS net/minecraft/unmapped/C_maikngon net/minecraft/advancement/criterion/LocationCriterionTrigger METHOD m_jeouaxek (Lnet/minecraft/unmapped/C_maikngon$C_zsxskcab;)Z ARG 0 conditions METHOD m_qjisaduw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;)V @@ -9,5 +9,11 @@ CLASS net/minecraft/unmapped/C_maikngon net/minecraft/advancement/criterion/Loca ARG 1 item METHOD m_flipnctj createAvoidVibration ()Lnet/minecraft/unmapped/C_rzypsigz; METHOD m_hmvkkudn createHeroOfTheVillage ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_ntewpyiq create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder METHOD m_qwkcggdj createTick ()Lnet/minecraft/unmapped/C_rzypsigz; - METHOD m_ttuubwul createInBed ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_rawiyhxg create (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder + METHOD m_ttuubwul createSleptInBed ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_xcudirzs create (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping deleted file mode 100644 index 5aea159b6c..0000000000 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/unmapped/C_hqkuepng net/minecraft/advancement/criterion/OnKilledCriterion - METHOD m_hvtnbuyw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)V - ARG 1 player - ARG 2 entity - ARG 3 killingDamage - METHOD m_legwxaut (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw;)Z - ARG 3 conditions - CLASS C_zknwqjsw Conditions - FIELD f_fzpobeto killingBlow Ljava/util/Optional; - FIELD f_lxfposld entity Ljava/util/Optional; - METHOD m_gvsemipa createPlayerKilledEntityNearSculkCatalyst ()Lnet/minecraft/unmapped/C_rzypsigz; - METHOD m_kilruvbo test (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z - ARG 1 player - ARG 2 killedEntityContext - ARG 3 killingBlow diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.mapping new file mode 100644 index 0000000000..6b6082ca5b --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.mapping @@ -0,0 +1,55 @@ +CLASS net/minecraft/unmapped/C_hqkuepng net/minecraft/advancement/criterion/OnKilledCriterionTrigger + METHOD m_hvtnbuyw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)V + ARG 1 player + ARG 2 entity + ARG 3 killingDamage + METHOD m_legwxaut (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw;)Z + ARG 3 conditions + CLASS C_zknwqjsw Conditions + FIELD f_fzpobeto killingBlow Ljava/util/Optional; + FIELD f_lxfposld entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_bkjcuoir createKilledBy (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder + METHOD m_clrnoerc createKilledBy ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_cybheuky createKilled (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + ARG 1 killingBlow + METHOD m_gqgopstd (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_pbkrjvwn;)V + ARG 1 killingBlow + METHOD m_gvsemipa createPlayerKilledEntityNearSculkCatalyst ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_kegmmdjd createKilled (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder + METHOD m_kilruvbo matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z + ARG 1 player + ARG 2 entityContext + ARG 3 killingBlow + METHOD m_kmtjpvgs createKilledBy (Ljava/util/Optional;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + ARG 1 killingBlow + METHOD m_mvkabtat createKilledBy (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + METHOD m_oeeafnap createKilled (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 builder + ARG 1 killingBlow + METHOD m_qdmqvcwc createKilled (Ljava/util/Optional;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + ARG 1 killingBlow + METHOD m_rlihhijt createKilledBy (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + ARG 1 killingBlow + METHOD m_solqanzo createKilledBy (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + ARG 1 killingBlow + METHOD m_wernpkjz createKilled (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + METHOD m_wheidqqn createKilled (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + ARG 1 killingBlow + METHOD m_wsuqvfnh createKilledBy (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + ARG 1 killingBlow + METHOD m_wtnmmkkr createKilled ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_xxtrmrzp (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.mapping similarity index 57% rename from mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.mapping index 10a7b4b19d..a354b8ab75 100644 --- a/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_mntpixlf net/minecraft/advancement/criterion/PickedUpThrownItemCriterion +CLASS net/minecraft/unmapped/C_mntpixlf net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger METHOD m_hsjbqbnl trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;)V ARG 1 player ARG 2 stack @@ -6,11 +6,23 @@ CLASS net/minecraft/unmapped/C_mntpixlf net/minecraft/advancement/criterion/Pick METHOD m_ypucoayn (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_mntpixlf$C_oqopxfol;)Z ARG 3 conditions CLASS C_oqopxfol Conditions - FIELD f_arggadrw pickedUp Ljava/util/Optional; + FIELD f_arggadrw entity Ljava/util/Optional; FIELD f_ojlhqcvr item Ljava/util/Optional; - METHOD m_gtmhuhvt test (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Z + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_coibqrao (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item + METHOD m_gtmhuhvt matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Z ARG 1 player ARG 2 stack ARG 3 context METHOD m_rdzxqeho createPickedUpByEntity (Lnet/minecraft/unmapped/C_ctsfmifk;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 player + ARG 1 item + ARG 2 entity + METHOD m_refrtcfh (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 entity METHOD m_tcywlilh createPickedUpByPlayer (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 player + ARG 1 item + ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping similarity index 70% rename from mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping index d3bedbfef5..ce33902837 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_ccuyenqy net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion +CLASS net/minecraft/unmapped/C_ccuyenqy net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger METHOD m_bwskqxvw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 player ARG 2 id @@ -6,7 +6,9 @@ CLASS net/minecraft/unmapped/C_ccuyenqy net/minecraft/advancement/criterion/Play ARG 1 conditions CLASS C_jvilurms Conditions FIELD f_zdzuorlo lootTable Lnet/minecraft/unmapped/C_ncpywfca; - METHOD m_ocoesmqp test (Lnet/minecraft/unmapped/C_ncpywfca;)Z + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 1 playerPredicate + METHOD m_ocoesmqp matches (Lnet/minecraft/unmapped/C_ncpywfca;)Z ARG 1 lootTable METHOD m_sdawxryt create (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 lootTable diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping deleted file mode 100644 index 5e234cfb39..0000000000 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/unmapped/C_cufgrabk net/minecraft/advancement/criterion/PlayerHurtEntityCriterion - METHOD m_kcilmtdb (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZLnet/minecraft/unmapped/C_cufgrabk$C_eldrleys;)Z - ARG 6 conditions - METHOD m_kvjmrvyj trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)V - ARG 1 player - ARG 2 entity - ARG 3 damage - ARG 4 dealt - ARG 5 taken - ARG 6 blocked - CLASS C_eldrleys Conditions - FIELD f_ttvdtidt damage Ljava/util/Optional; - FIELD f_yqisamch entity Ljava/util/Optional; - METHOD m_bkbacnnp matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)Z - ARG 1 player - ARG 2 entityContext - ARG 3 source - ARG 4 dealt - ARG 5 taken - ARG 6 blocked diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.mapping new file mode 100644 index 0000000000..bdeaeff278 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.mapping @@ -0,0 +1,39 @@ +CLASS net/minecraft/unmapped/C_cufgrabk net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger + METHOD m_kcilmtdb (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZLnet/minecraft/unmapped/C_cufgrabk$C_eldrleys;)Z + ARG 6 conditions + METHOD m_kvjmrvyj trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)V + ARG 1 player + ARG 2 entity + ARG 3 damage + ARG 4 dealt + ARG 5 taken + ARG 6 blocked + CLASS C_eldrleys Conditions + FIELD f_ttvdtidt damage Ljava/util/Optional; + FIELD f_yqisamch entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_bkbacnnp matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)Z + ARG 1 player + ARG 2 entityContext + ARG 3 source + ARG 4 dealt + ARG 5 taken + ARG 6 blocked + METHOD m_flcbgodf createDamage (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 damage + METHOD m_ivjcvnjx createEntity (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + METHOD m_kouavecu (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_mzdoirue;)V + ARG 1 damage + METHOD m_qjgbziuh create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 damage + ARG 1 entity + METHOD m_rfnemosy create ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_vqupybid create (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 damage + ARG 1 entity + METHOD m_yfqhvjuf createDamage (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 damage + METHOD m_zsuittgk (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping deleted file mode 100644 index 7c8fa06270..0000000000 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/unmapped/C_bvljsgzr net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion - METHOD m_mcaohdfe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_bvljsgzr$C_dwldgxex;)Z - ARG 2 conditions - METHOD m_phoqowce trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;)V - ARG 1 player - ARG 2 stack - ARG 3 entity - CLASS C_dwldgxex Conditions - FIELD f_dzdeopor entity Ljava/util/Optional; - FIELD f_vnlyypoa item Ljava/util/Optional; - METHOD m_sxysgxiu test (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Z - ARG 1 stack - ARG 2 context diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.mapping new file mode 100644 index 0000000000..0178041566 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/unmapped/C_bvljsgzr net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger + METHOD m_mcaohdfe (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_bvljsgzr$C_dwldgxex;)Z + ARG 2 conditions + METHOD m_phoqowce trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;)V + ARG 1 player + ARG 2 stack + ARG 3 entity + CLASS C_dwldgxex Conditions + FIELD f_dzdeopor entity Ljava/util/Optional; + FIELD f_vnlyypoa item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_fwgqolnp (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item + METHOD m_lrrfisea create (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item + ARG 1 entity + METHOD m_sxysgxiu matches (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Z + ARG 1 stack + ARG 2 context + METHOD m_tpsrnatg create (Ljava/util/Optional;Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 player + ARG 1 item + ARG 2 entity + METHOD m_xnygqrnm (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping deleted file mode 100644 index 547b5490a9..0000000000 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/unmapped/C_thfyxhzz net/minecraft/advancement/criterion/RecipeCraftedCriterion - METHOD m_erktjebj trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V - ARG 1 player - ARG 2 recipeId - ARG 3 ingredients - CLASS C_fznnyxkh Conditions - FIELD f_afckjgza predicates Ljava/util/List; - FIELD f_tliwdtji recipeId Lnet/minecraft/unmapped/C_ncpywfca; - METHOD m_srqmbfmi (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)Z - ARG 2 stacks diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.mapping new file mode 100644 index 0000000000..40f51e87fe --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/unmapped/C_thfyxhzz net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger + METHOD m_erktjebj trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V + ARG 1 player + ARG 2 recipeId + ARG 3 ingredients + METHOD m_zjkktotq (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;Lnet/minecraft/unmapped/C_thfyxhzz$C_fznnyxkh;)Z + ARG 2 conditions + CLASS C_fznnyxkh Conditions + FIELD f_afckjgza ingredients Ljava/util/List; + FIELD f_tliwdtji recipeId Lnet/minecraft/unmapped/C_ncpywfca; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V + ARG 1 playerPredicate + METHOD m_daeektkr create (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 recipeId + METHOD m_lioifgzt create (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 recipeId + ARG 1 ingredients + METHOD m_srqmbfmi matches (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)Z + ARG 1 recipeId + ARG 2 stacks diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.mapping similarity index 76% rename from mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.mapping index 2c9c2cf6ae..5e32522b0c 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.mapping @@ -1,10 +1,14 @@ -CLASS net/minecraft/unmapped/C_myulluhr net/minecraft/advancement/criterion/RecipeUnlockedCriterion +CLASS net/minecraft/unmapped/C_myulluhr net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger METHOD m_cvaeuvfg create (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 id METHOD m_jubbglvn trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_dscbrwbj;)V ARG 1 player + ARG 2 unlocker METHOD m_zydfddgn (Lnet/minecraft/unmapped/C_dscbrwbj;Lnet/minecraft/unmapped/C_myulluhr$C_zzjwgfkt;)Z ARG 1 conditions CLASS C_zzjwgfkt Conditions FIELD f_yhqfrsgg recipe Lnet/minecraft/unmapped/C_ncpywfca; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 1 playerPredicate METHOD m_pjzabcwj matches (Lnet/minecraft/unmapped/C_dscbrwbj;)Z + ARG 1 unlocker diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.mapping similarity index 51% rename from mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.mapping index 746ff2a2a0..d06fb5e8ed 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_ucuoichm net/minecraft/advancement/criterion/ShotCrossbowCriterion +CLASS net/minecraft/unmapped/C_ucuoichm net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger METHOD m_lugsumsm trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 player ARG 2 stack @@ -6,5 +6,13 @@ CLASS net/minecraft/unmapped/C_ucuoichm net/minecraft/advancement/criterion/Shot ARG 1 conditions CLASS C_pjsuhcqx Conditions FIELD f_jjugdvgn item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_amuocayq matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack + METHOD m_gqroykrq create (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item + METHOD m_pcdkbhia (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item + METHOD m_xgakdxtg create (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.mapping similarity index 59% rename from mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.mapping index 4337db398a..9da958ae51 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.mapping @@ -1,15 +1,21 @@ -CLASS net/minecraft/unmapped/C_guvqoceu net/minecraft/advancement/criterion/SlideDownBlockCriterion +CLASS net/minecraft/unmapped/C_guvqoceu net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger METHOD m_ftrrknkj (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/String;)V ARG 1 key METHOD m_kcppupqo getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_mmxmpdoq; ARG 0 root + METHOD m_osdxdvyk (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_guvqoceu$C_rzzwrqgc;)Z + ARG 1 conditions METHOD m_ybycnors trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_txtbiemp;)V ARG 1 player ARG 2 state CLASS C_rzzwrqgc Conditions FIELD f_lnvqlhga state Ljava/util/Optional; FIELD f_yazmngap block Lnet/minecraft/unmapped/C_mmxmpdoq; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_aqizbrei (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_fsjpkzrx;)V + ARG 1 state METHOD m_bovizfbr create (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 block - METHOD m_yohpcszm test (Lnet/minecraft/unmapped/C_txtbiemp;)Z + METHOD m_yohpcszm matches (Lnet/minecraft/unmapped/C_txtbiemp;)Z ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.mapping similarity index 90% rename from mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.mapping index ec586e962d..c00fa6bcbc 100644 --- a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_fotumhme net/minecraft/advancement/criterion/StartedRidingCriterion +CLASS net/minecraft/unmapped/C_fotumhme net/minecraft/advancement/criterion/StartedRidingCriterionTrigger METHOD m_dfaczeza (Lnet/minecraft/unmapped/C_fotumhme$C_qazonvoi;)Z ARG 0 conditions METHOD m_rspnmill trigger (Lnet/minecraft/unmapped/C_mxrobsgg;)V diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.mapping similarity index 70% rename from mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.mapping index 7f030326b0..bdf8f63c36 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_ckqxcepo net/minecraft/advancement/criterion/SummonedEntityCriterion +CLASS net/minecraft/unmapped/C_ckqxcepo net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger METHOD m_annbqull trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;)V ARG 1 player ARG 2 entity @@ -6,7 +6,11 @@ CLASS net/minecraft/unmapped/C_ckqxcepo net/minecraft/advancement/criterion/Summ ARG 1 conditions CLASS C_rpttlyon Conditions FIELD f_ljocxpgb entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate + METHOD m_dxloovbj (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 entity METHOD m_fnicjlur create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; - ARG 0 summonedEntityPredicateBuilder + ARG 0 entity METHOD m_hqigeatb matches (Lnet/minecraft/unmapped/C_iakykpgh;)Z ARG 1 summonedEntityContext diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.mapping similarity index 53% rename from mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.mapping index 5cba8cec92..10d2417e91 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_aaelkaim net/minecraft/advancement/criterion/TameAnimalCriterion +CLASS net/minecraft/unmapped/C_aaelkaim net/minecraft/advancement/criterion/TameAnimalCriterionTrigger METHOD m_adklspla trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_tprvtfff;)V ARG 1 player ARG 2 entity @@ -6,5 +6,12 @@ CLASS net/minecraft/unmapped/C_aaelkaim net/minecraft/advancement/criterion/Tame ARG 1 conditions CLASS C_sbyfjkts Conditions FIELD f_ikjlnsry entity Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_abapfmom matches (Lnet/minecraft/unmapped/C_iakykpgh;)Z ARG 1 tamedEntityContext + METHOD m_hlnnlujk create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 entity + METHOD m_moqgqetz (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 entity + METHOD m_zedqjjws create ()Lnet/minecraft/unmapped/C_rzypsigz; diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.mapping similarity index 75% rename from mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.mapping index 06411be412..0b92543fc4 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_vqqxzpxi net/minecraft/advancement/criterion/TargetHitCriterion +CLASS net/minecraft/unmapped/C_vqqxzpxi net/minecraft/advancement/criterion/TargetHitCriterionTrigger METHOD m_fowywwvw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;I)V ARG 1 player ARG 2 projectile @@ -9,9 +9,14 @@ CLASS net/minecraft/unmapped/C_vqqxzpxi net/minecraft/advancement/criterion/Targ CLASS C_xwywjnst Conditions FIELD f_cpwrcmak projectile Ljava/util/Optional; FIELD f_sxrknjfh signalStrength Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_miqhspjs test (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_vgpupfxx;I)Z ARG 1 projectileContext ARG 2 hitPos ARG 3 signalStrength + METHOD m_opxswflh (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 projectile METHOD m_sfzxnxxw create (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 signalStrength + ARG 1 projectile diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterionTrigger.mapping similarity index 77% rename from mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/TravelCriterionTrigger.mapping index 5e62975562..97f6bf8b03 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_ntathoag net/minecraft/advancement/criterion/TravelCriterion +CLASS net/minecraft/unmapped/C_ntathoag net/minecraft/advancement/criterion/TravelCriterionTrigger METHOD m_ixijxkfi (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_ntathoag$C_mnjnxtmp;)Z ARG 3 conditions METHOD m_rtoklwvb trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vgpupfxx;)V @@ -7,8 +7,12 @@ CLASS net/minecraft/unmapped/C_ntathoag net/minecraft/advancement/criterion/Trav CLASS C_mnjnxtmp Conditions FIELD f_jsyyvijr distance Ljava/util/Optional; FIELD f_pvjxuhms startPos Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_bjnhyqsd netherTravel (Lnet/minecraft/unmapped/C_ullximxc;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 distance + METHOD m_cvlztimj (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ullximxc;)V + ARG 1 distance METHOD m_pbiixtvj rideEntityInLava (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_ullximxc;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 entity ARG 1 distance @@ -16,6 +20,9 @@ CLASS net/minecraft/unmapped/C_ntathoag net/minecraft/advancement/criterion/Trav ARG 1 world ARG 2 startPos ARG 3 endPos + METHOD m_wlwqaipd (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ypvebgnl;)V + ARG 1 startPos METHOD m_zmhmpfzx fallFromHeight (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_ullximxc;Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 entity ARG 1 distance + ARG 2 startPos diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.mapping similarity index 74% rename from mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.mapping index c012f0fb15..439efb0de3 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_orbfkeui net/minecraft/advancement/criterion/UsedEnderEyeCriterion +CLASS net/minecraft/unmapped/C_orbfkeui net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger METHOD m_ihxupalx trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 player ARG 2 strongholdPos @@ -6,5 +6,7 @@ CLASS net/minecraft/unmapped/C_orbfkeui net/minecraft/advancement/criterion/Used ARG 2 conditions CLASS C_iegpsuog Conditions FIELD f_frixxjqx distance Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; + METHOD (Ljava/util/Optional;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)V + ARG 1 playerPredicate METHOD m_cheupquh matches (D)Z ARG 1 distance diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.mapping similarity index 57% rename from mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.mapping index b43bb2f3c4..4cc8d1b420 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_clwnikrb net/minecraft/advancement/criterion/UsedTotemCriterion +CLASS net/minecraft/unmapped/C_clwnikrb net/minecraft/advancement/criterion/UsedTotemCriterionTrigger METHOD m_gnfhnqch (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_clwnikrb$C_xpcxkzoa;)Z ARG 1 conditions METHOD m_puhqsdno trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -6,5 +6,11 @@ CLASS net/minecraft/unmapped/C_clwnikrb net/minecraft/advancement/criterion/Used ARG 2 stack CLASS C_xpcxkzoa Conditions FIELD f_plunrfjp item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_emvfqcea matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack + METHOD m_eotjhohv create (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item + METHOD m_gqfgfzsm create (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 item diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.mapping similarity index 74% rename from mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.mapping index d0b17eacfe..59e3e81cca 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_jtrqmgsq net/minecraft/advancement/criterion/UsingItemCriterion +CLASS net/minecraft/unmapped/C_jtrqmgsq net/minecraft/advancement/criterion/UsingItemCriterionTrigger METHOD m_apvjelbd (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jtrqmgsq$C_nenbghty;)Z ARG 1 conditions METHOD m_kxjgyfee trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -6,8 +6,12 @@ CLASS net/minecraft/unmapped/C_jtrqmgsq net/minecraft/advancement/criterion/Usin ARG 2 stack CLASS C_nenbghty Conditions FIELD f_byhygkwo item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_jfxcasmr test (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack METHOD m_uclaewhf create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 player ARG 1 item + METHOD m_wcyoqxmz (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.mapping similarity index 55% rename from mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.mapping index 46409834dc..d3458cd6aa 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/unmapped/C_yddyhqpp net/minecraft/advancement/criterion/VillagerTradeCriterion +CLASS net/minecraft/unmapped/C_yddyhqpp net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger METHOD m_ozaxeyyb (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yddyhqpp$C_roruwsnz;)Z ARG 2 conditions METHOD m_vnacuaud trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vyfsmbcg;Lnet/minecraft/unmapped/C_sddaxwyk;)V @@ -8,6 +8,15 @@ CLASS net/minecraft/unmapped/C_yddyhqpp net/minecraft/advancement/criterion/Vill CLASS C_roruwsnz Conditions FIELD f_bdcnndjx villager Ljava/util/Optional; FIELD f_ctaaopnz item Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V + ARG 1 playerPredicate METHOD m_ejngplad matches (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 merchantContext ARG 2 stack + METHOD m_exjwrtdi (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_afravpde;)V + ARG 1 item + METHOD m_omysqoyn create ()Lnet/minecraft/unmapped/C_rzypsigz; + METHOD m_ufyndykz (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;)V + ARG 1 villager + METHOD m_zwpwphkq create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_rzypsigz; + ARG 0 player diff --git a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping index 36d46be858..836b0e4fff 100644 --- a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping +++ b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_wojlspxv net/minecraft/client/network/ClientAdvancementManager + FIELD f_alghqygu tree Lnet/minecraft/unmapped/C_xhjcixzl; FIELD f_hqcdhkqv listener Lnet/minecraft/unmapped/C_wojlspxv$C_unlhtyen; FIELD f_newkcxri advancementProgresses Ljava/util/Map; FIELD f_nzamfrgq LOGGER Lorg/slf4j/Logger; @@ -17,3 +18,4 @@ CLASS net/minecraft/unmapped/C_wojlspxv net/minecraft/client/network/ClientAdvan METHOD m_rcdtdenx setProgress (Lnet/minecraft/unmapped/C_seqaydby;Lnet/minecraft/unmapped/C_rpzbknxp;)V ARG 2 progress METHOD m_ygzrpbtp selectTab (Lnet/minecraft/unmapped/C_unoypvme;)V + ARG 1 advancementHolder diff --git a/mappings/net/minecraft/client/toast/AdvancementToast.mapping b/mappings/net/minecraft/client/toast/AdvancementToast.mapping index ed55c2d3d9..e81fb15834 100644 --- a/mappings/net/minecraft/client/toast/AdvancementToast.mapping +++ b/mappings/net/minecraft/client/toast/AdvancementToast.mapping @@ -2,4 +2,4 @@ CLASS net/minecraft/unmapped/C_ysxfxxzj net/minecraft/client/toast/AdvancementTo FIELD f_acmyrgam soundPlayed Z FIELD f_ipuirltv DEFAULT_DURATION_MS I FIELD f_svnpauzt BACKGROUND_TEXTURE Lnet/minecraft/unmapped/C_ncpywfca; - FIELD f_wizbfuyp advancement Lnet/minecraft/unmapped/C_unoypvme; + FIELD f_wizbfuyp advancementHolder Lnet/minecraft/unmapped/C_unoypvme; diff --git a/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping index 038fe5c27b..b51d3b905d 100644 --- a/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping @@ -1,12 +1,20 @@ CLASS net/minecraft/unmapped/C_unbelsbg net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator FIELD f_rqtgaigz ENEMY_MOBS [Lnet/minecraft/unmapped/C_ogavsvbr; + METHOD m_cwszvfic (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 builder METHOD m_fdomsedq usingItemAndLookingAtEntityCondition (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 type ARG 1 item + METHOD m_ibaruuym (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 builder METHOD m_kpzuqmoa lightningStruckWithingRange (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz; ARG 0 range METHOD m_mgvgqwrb appendEnterAllBiomesCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;Ljava/util/List;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; ARG 0 task ARG 1 biomes + METHOD m_pyldeoxx (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_unoypvme;Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr;)V + ARG 1 advancementHolder + ARG 2 preset METHOD m_wvlvqnhd appendKillAllEnemyMobsCriterion (Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv;)Lnet/minecraft/unmapped/C_kdwyuhdb$C_dukbjvrv; + ARG 0 builder ARG 1 task diff --git a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping index 28106507dd..cf2daac4a9 100644 --- a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/unmapped/C_ramegrrx net/minecraft/loot/condition/AllOfLootCondition + FIELD f_oxgvbkyk CODEC Lcom/mojang/serialization/Codec; CLASS C_tbmltwqb Builder diff --git a/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping index e3c9b55483..e6f127579d 100644 --- a/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/unmapped/C_nmcwjjew net/minecraft/loot/condition/AnyOfLootCondition + METHOD (Ljava/util/List;)V + ARG 1 lootConditions METHOD m_rcgqndpt create ([Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_nmcwjjew$C_psqvslms; ARG 0 builders CLASS C_psqvslms Builder diff --git a/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping b/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping index fc276399d1..7afdb8a6b1 100644 --- a/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping @@ -10,3 +10,4 @@ CLASS net/minecraft/unmapped/C_ctyjhvds net/minecraft/loot/condition/CompoundLoo METHOD m_liolcgkn add (Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)V ARG 1 builder METHOD m_rokhhcul build (Ljava/util/List;)Lnet/minecraft/unmapped/C_vqkczpuv; + ARG 1 lootConditions diff --git a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping index 8dc4c71073..430d8befaf 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.mapping @@ -1,21 +1,22 @@ CLASS net/minecraft/unmapped/C_xjdndsdi net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket FIELD f_dfyajwaf clearCurrent Z - FIELD f_jgrwxkoo toRemove Ljava/util/Set; - FIELD f_obikreny toEarn Ljava/util/List; - FIELD f_qexvshtf toSetProgress Ljava/util/Map; + FIELD f_jgrwxkoo toHide Ljava/util/Set; + FIELD f_obikreny toShow Ljava/util/List; + FIELD f_qexvshtf toProgress Ljava/util/Map; METHOD (Lnet/minecraft/unmapped/C_idfydwco;)V ARG 1 buf METHOD (ZLjava/util/Collection;Ljava/util/Set;Ljava/util/Map;)V ARG 1 clearCurrent - ARG 2 toEarn - ARG 3 toRemove - ARG 4 toSetProgress - METHOD m_gecsyuga getAdvancementIdsToRemove ()Ljava/util/Set; - METHOD m_hqceugcx getAdvancementsToEarn ()Ljava/util/List; + ARG 2 toShow + ARG 3 toHide + ARG 4 toProgress + METHOD m_gecsyuga getToHide ()Ljava/util/Set; + METHOD m_hqceugcx getToShow ()Ljava/util/List; METHOD m_itnoscau shouldClearCurrent ()Z METHOD m_mqjlwybl (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_unoypvme;)V ARG 0 buf + ARG 1 holder METHOD m_ngconeuf (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_rpzbknxp;)V ARG 0 buf ARG 1 progress - METHOD m_twueiavl getAdvancementsToProgress ()Ljava/util/Map; + METHOD m_twueiavl getToProgress ()Ljava/util/Map; diff --git a/mappings/net/minecraft/predicate/ContextAwarePredicate.mapping b/mappings/net/minecraft/predicate/ContextAwarePredicate.mapping new file mode 100644 index 0000000000..a5f65e3150 --- /dev/null +++ b/mappings/net/minecraft/predicate/ContextAwarePredicate.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/unmapped/C_ctsfmifk net/minecraft/predicate/ContextAwarePredicate + FIELD f_rvptvckz compositePredicate Ljava/util/function/Predicate; + FIELD f_yxgkwomu lootConditions Ljava/util/List; + METHOD m_bedcmskq of ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_ctsfmifk; + ARG 0 lootConditions + METHOD m_cvrwovds toJson (Ljava/util/List;)Lcom/google/gson/JsonElement; + ARG 0 predicates + METHOD m_douvdayy fromElement (Ljava/lang/String;Lnet/minecraft/unmapped/C_gzewtdot;Lcom/google/gson/JsonElement;Lnet/minecraft/unmapped/C_vczsvjil;)Ljava/util/Optional; + ARG 0 name + ARG 1 deserializer + ARG 2 jsonElement + ARG 3 lootContextType + METHOD m_iuimbrve test (Lnet/minecraft/unmapped/C_iakykpgh;)Z + ARG 1 context + METHOD m_zpbhkclx toJson ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index cb07d3a912..e3c5651b3a 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/unmapped/C_nihhkamy net/minecraft/predicate/NumberRange METHOD m_fdqmwkvp fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; ARG 0 reader ARG 1 converter + METHOD m_komxgdmj toJson ()Lcom/google/gson/JsonElement; METHOD m_lsxwlioa between (II)Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; ARG 0 min ARG 1 max diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index f12e524138..b2d67ca62c 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -17,3 +17,11 @@ CLASS net/minecraft/unmapped/C_nysuqcvh net/minecraft/predicate/entity/EntityEff FIELD f_syqzvsja amplifier Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; METHOD m_iwzawukj test (Lnet/minecraft/unmapped/C_wpfizwve;)Z ARG 1 statusEffectInstance + CLASS C_tmpwnbuk Builder + FIELD f_gpkvjaye builder Lcom/google/common/collect/ImmutableMap$Builder; + METHOD m_iuvsanzp build ()Ljava/util/Optional; + METHOD m_jaeahkqp (Lnet/minecraft/unmapped/C_jaqasomh;)Lnet/minecraft/unmapped/C_nysuqcvh$C_tmpwnbuk; + ARG 1 effect + METHOD m_thcsjcsg (Lnet/minecraft/unmapped/C_jaqasomh;Lnet/minecraft/unmapped/C_nysuqcvh$C_qvelrybl;)Lnet/minecraft/unmapped/C_nysuqcvh$C_tmpwnbuk; + ARG 1 effect + ARG 2 data diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 7979738498..8c05322fab 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -13,16 +13,38 @@ CLASS net/minecraft/unmapped/C_kvkvpjlm net/minecraft/predicate/entity/EntityPre FIELD f_ycxvlbvr equipment Ljava/util/Optional; FIELD f_yvrkjogt vehicle Ljava/util/Optional; METHOD m_cviarbxt toJson ()Lcom/google/gson/JsonElement; + METHOD m_lenpszae fromBuilder (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_ctsfmifk; + ARG 0 builder + METHOD m_lvpiqxph fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; + ARG 0 jsonElement + METHOD m_natxrzae fromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/unmapped/C_gzewtdot;)Ljava/util/Optional; + ARG 0 json + ARG 1 name + ARG 2 deserializer METHOD m_npdomabq test (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 world ARG 2 pos ARG 3 entity + METHOD m_opnjebfi fromElement (Ljava/lang/String;Lnet/minecraft/unmapped/C_gzewtdot;Lcom/google/gson/JsonElement;)Ljava/util/Optional; + ARG 0 name + ARG 1 deserializer + ARG 2 jsonElement + METHOD m_qjfpptij wrap (Ljava/util/Optional;)Ljava/util/Optional; + ARG 0 predicate METHOD m_sqkvtqxf createAdvancementEntityLootContext (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_iakykpgh; ARG 0 player ARG 1 target METHOD m_txfawcdj test (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 player ARG 2 entity + METHOD m_wwfhkpji wrap (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_ctsfmifk; + ARG 0 predicate + METHOD m_yxtvlcic fromBuilders ([Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Ljava/util/List; + ARG 0 builders + METHOD m_zchfsdgz fromJsonArray (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/unmapped/C_gzewtdot;)Ljava/util/List; + ARG 0 json + ARG 1 name + ARG 2 deserializer CLASS C_fnhnavbg Builder FIELD f_adlgaflf targetedEntity Ljava/util/Optional; FIELD f_agfbxblt distance Ljava/util/Optional; @@ -37,8 +59,12 @@ CLASS net/minecraft/unmapped/C_kvkvpjlm net/minecraft/predicate/entity/EntityPre FIELD f_tjhcdgoz location Ljava/util/Optional; FIELD f_upesirxb flags Ljava/util/Optional; FIELD f_xwwrgnab typeSpecific Ljava/util/Optional; + METHOD m_chvbngwo equipment (Lnet/minecraft/unmapped/C_pcnmkxrp;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 equipment METHOD m_dscijmse vehicle (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder METHOD m_dxowdvhv targetedEntity (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder METHOD m_fydefeme tagged (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; ARG 1 tag METHOD m_gcigjkih typeSpecific (Lnet/minecraft/unmapped/C_ljtxhtrw;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; @@ -46,17 +72,24 @@ CLASS net/minecraft/unmapped/C_kvkvpjlm net/minecraft/predicate/entity/EntityPre METHOD m_idxctzvt team (Ljava/lang/String;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; ARG 1 team METHOD m_isspaqjq location (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder METHOD m_kzfexoou distance (Lnet/minecraft/unmapped/C_ullximxc;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; ARG 1 distance METHOD m_mqcqikci effects (Lnet/minecraft/unmapped/C_nysuqcvh$C_tmpwnbuk;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder METHOD m_nqtoxgxm flags (Lnet/minecraft/unmapped/C_rptqszvm$C_nbivukxv;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder METHOD m_pisabjzy nbt (Lnet/minecraft/unmapped/C_emmbeecz;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; ARG 1 nbt METHOD m_ppezcjrt type (Lnet/minecraft/unmapped/C_wrnalooj;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; ARG 1 type METHOD m_pthqlbeh build ()Lnet/minecraft/unmapped/C_kvkvpjlm; METHOD m_qmnpijza passenger (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder METHOD m_qztugqib steppingOn (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder + METHOD m_uivueovc equipment (Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + ARG 1 builder METHOD m_vkqspldb type (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; ARG 1 type METHOD m_zrmwluqr create ()Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 8c8c54f338..457736d1f3 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -26,13 +26,17 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP FIELD f_xezgeelf light Ljava/util/Optional; FIELD f_yijrvruc smokey Ljava/util/Optional; METHOD m_diuvndpc light (Lnet/minecraft/unmapped/C_ammgthmo$C_kadjxsdu;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; + ARG 1 builder METHOD m_dsbslmxh z (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; ARG 1 z METHOD m_dxvijcur fluid (Lnet/minecraft/unmapped/C_fjarvlro$C_ahtnwewe;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; + ARG 1 builder METHOD m_fxeygeib smokey (Z)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; + ARG 1 smokey METHOD m_gaogqdje y (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; ARG 1 y METHOD m_hibprzfm block (Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; + ARG 1 builder METHOD m_idydmjlz create ()Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; METHOD m_jbegsyza biome (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; ARG 1 biome diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 61cfb9c58c..d88a4111bf 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_afravpde net/minecraft/predicate/item/ItemPredica FIELD f_rumeafbo enchantments Ljava/util/List; FIELD f_unmuvhdr count Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; FIELD f_zipcqdwu items Ljava/util/Optional; + METHOD m_drssolum toJson (Ljava/util/List;)Lcom/google/gson/JsonElement; METHOD m_iftxvtov deserializeAll (Lcom/google/gson/JsonElement;)Ljava/util/List; ARG 0 el METHOD m_nqcovmeo fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping index 6993658256..cb6df35735 100644 --- a/mappings/net/minecraft/server/ServerAdvancementLoader.mapping +++ b/mappings/net/minecraft/server/ServerAdvancementLoader.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/unmapped/C_fktoyupt net/minecraft/server/ServerAdvancementLoader + FIELD f_aygqhpyd tree Lnet/minecraft/unmapped/C_xhjcixzl; FIELD f_kvdcxlvl LOGGER Lorg/slf4j/Logger; FIELD f_kzsznscx lootManager Lnet/minecraft/unmapped/C_uxsnhxlb; FIELD f_lwpauehw GSON Lcom/google/gson/Gson; @@ -6,6 +7,9 @@ CLASS net/minecraft/unmapped/C_fktoyupt net/minecraft/server/ServerAdvancementLo METHOD (Lnet/minecraft/unmapped/C_uxsnhxlb;)V ARG 1 lootManager METHOD m_blvqagoa getAdvancements ()Ljava/util/Collection; + METHOD m_efahmkkq getTree ()Lnet/minecraft/unmapped/C_xhjcixzl; + METHOD m_qkwbflnz getHolder (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_unoypvme; + ARG 1 id METHOD m_zsxthyde (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/unmapped/C_ncpywfca;Lcom/google/gson/JsonElement;)V ARG 2 id ARG 3 json diff --git a/mappings/net/minecraft/server/command/AdvancementCommand.mapping b/mappings/net/minecraft/server/command/AdvancementCommand.mapping index b9a6c93143..2df4f748ed 100644 --- a/mappings/net/minecraft/server/command/AdvancementCommand.mapping +++ b/mappings/net/minecraft/server/command/AdvancementCommand.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/unmapped/C_bduaeawv net/minecraft/server/command/Advancement ARG 0 source ARG 1 targets ARG 2 operation + ARG 3 advancementHolder ARG 4 criterion METHOD m_xdbniani (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index c6275391c4..7772689f0f 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/unmapped/C_qhrnrrcp net/minecraft/text/HoverEvent ARG 1 action METHOD m_zqghjbce getAction ()Lnet/minecraft/unmapped/C_qhrnrrcp$C_dmyxtvqo; CLASS C_dmyxtvqo Action + FIELD f_efzrdugq SHOW_TEXT Lnet/minecraft/unmapped/C_qhrnrrcp$C_dmyxtvqo; FIELD f_fwdruxcl parsable Z FIELD f_ylfcdbhm name Ljava/lang/String; METHOD m_oesuwymv cast (Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/unmapped/C_ctsfmifk.mapping b/mappings/net/minecraft/unmapped/C_ctsfmifk.mapping deleted file mode 100644 index 8e56c6ac0d..0000000000 --- a/mappings/net/minecraft/unmapped/C_ctsfmifk.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/unmapped/C_ctsfmifk - FIELD f_yxgkwomu lootConditions Ljava/util/List; - METHOD m_bedcmskq ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_ctsfmifk; - ARG 0 lootConditions diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index 1f3ed48010..a143d45fba 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -116,6 +116,9 @@ CLASS net/minecraft/unmapped/C_qtbzyiey net/minecraft/util/JsonHelper ARG 2 defaultObject METHOD m_lttzblfb isBoolean (Lcom/google/gson/JsonElement;)Z ARG 0 object + METHOD m_mgjklxye getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/unmapped/C_cjzoxshv; + ARG 0 object + ARG 1 name METHOD m_mjzgyrmh getType (Lcom/google/gson/JsonElement;)Ljava/lang/String; ARG 0 element METHOD m_mpzgwusn toSortedString (Lcom/google/gson/JsonElement;)Ljava/lang/String; @@ -255,3 +258,7 @@ CLASS net/minecraft/unmapped/C_qtbzyiey net/minecraft/util/JsonHelper ARG 0 object ARG 1 element ARG 2 defaultInt + METHOD m_zzkelqge getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_cjzoxshv; + ARG 0 object + ARG 1 name + ARG 2 defaultItem