diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 585a3beac5..720b1dd4e0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,16 +37,6 @@ jobs: SNAPSHOTS_USERNAME: ${{ secrets.SNAPSHOTS_USERNAME }} SNAPSHOTS_PASSWORD: ${{ secrets.SNAPSHOTS_PASSWORD }} BRANCH_NAME: ${{ github.ref }} - - name: Publish javadoc to javadoc.quiltmc.org - uses: shallwefootball/upload-s3-action@v1.3.3 - with: - aws_key_id: ${{ secrets.JAVADOC_USERNAME }} - aws_secret_access_key: ${{ secrets.JAVADOC_PASSWORD }} - aws_bucket: ${{ secrets.JAVADOC_BUCKET }} - endpoint: ${{ secrets.JAVADOC_URL }} - source_dir: ./build/docs/ - destination_dir: "quilt-mappings" - # Javadoc publishing - name: Update Quilt Meta uses: quiltmc/update-quilt-meta@main with: diff --git a/buildSrc/src/main/java/quilt/internal/Constants.java b/buildSrc/src/main/java/quilt/internal/Constants.java index 6c14ff8b47..1ffab505e4 100644 --- a/buildSrc/src/main/java/quilt/internal/Constants.java +++ b/buildSrc/src/main/java/quilt/internal/Constants.java @@ -1,7 +1,7 @@ package quilt.internal; public class Constants { - public static final String MINECRAFT_VERSION = "23w31a"; + public static final String MINECRAFT_VERSION = "23w32a"; public static final String MAPPINGS_NAME = "quilt-mappings"; diff --git a/mappings/com/mojang/blaze3d/font/SpaceFont.mapping b/mappings/com/mojang/blaze3d/font/SpaceFont.mapping index b858a00bc3..d6f17037d6 100644 --- a/mappings/com/mojang/blaze3d/font/SpaceFont.mapping +++ b/mappings/com/mojang/blaze3d/font/SpaceFont.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/unmapped/C_auoqqcdl com/mojang/blaze3d/font/SpaceFont FIELD f_qzendodg emptyGlyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + METHOD (Ljava/util/Map;)V + ARG 1 advances + METHOD m_wdqmreap (Ljava/lang/Integer;Ljava/lang/Float;)V + ARG 1 codepoint + ARG 2 advance CLASS C_rmisfmyo SpaceFontTypeProvider FIELD f_mqfzdjwl CODEC Lcom/mojang/serialization/MapCodec; + METHOD m_zesazefp (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index df6f02a5be..76b2bd725f 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -287,6 +287,15 @@ CLASS com/mojang/blaze3d/platform/GlStateManager com/mojang/blaze3d/platform/GlS ARG 6 format ARG 7 type ARG 8 pixels + METHOD _upload (IIIIILnet/minecraft/unmapped/C_ayikuhxa$C_pfzicqtf;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V + ARG 0 mipLevels + ARG 1 xOffset + ARG 2 yOffset + ARG 3 width + ARG 4 height + ARG 5 format + ARG 6 pixels + ARG 7 pixelConsumer METHOD _vertexAttribIPointer _vertexAttribIPointer (IIIIJ)V ARG 0 index ARG 1 size @@ -358,6 +367,15 @@ CLASS com/mojang/blaze3d/platform/GlStateManager com/mojang/blaze3d/platform/GlS ARG 0 light0 ARG 1 light1 ARG 2 modelMatrix + METHOD upload (IIIIILnet/minecraft/unmapped/C_ayikuhxa$C_pfzicqtf;Ljava/nio/IntBuffer;Ljava/util/function/Consumer;)V + ARG 0 mipLevels + ARG 1 xOffset + ARG 2 yOffset + ARG 3 width + ARG 4 height + ARG 5 format + ARG 6 pixels + ARG 7 pixelConsumer CLASS C_hfcoodvl LogicOp FIELD f_yldbwizx value I METHOD (Ljava/lang/String;II)V diff --git a/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping b/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping index c2938b79d6..60385cf8e8 100644 --- a/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping +++ b/mappings/com/mojang/blaze3d/texture/TextureUtil.mapping @@ -30,6 +30,9 @@ CLASS com/mojang/blaze3d/platform/TextureUtil com/mojang/blaze3d/texture/Texture ARG 4 height METHOD readResource readResource (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; ARG 0 inputStream + METHOD readResource (Ljava/nio/channels/ReadableByteChannel;I)Ljava/nio/ByteBuffer; + ARG 0 bytes + ARG 1 defaultSize METHOD releaseTextureId releaseTextureId (I)V ARG 0 id METHOD writeAsPNG writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIII)V @@ -39,3 +42,11 @@ CLASS com/mojang/blaze3d/platform/TextureUtil com/mojang/blaze3d/texture/Texture ARG 3 mipLevels ARG 4 width ARG 5 height + METHOD writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIIILjava/util/function/IntUnaryOperator;)V + ARG 0 path + ARG 1 imageName + ARG 2 id + ARG 3 mipLevels + ARG 4 width + ARG 5 height + ARG 6 function diff --git a/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping b/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping index 66aaca94cd..14530c8cc7 100644 --- a/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping +++ b/mappings/com/mojang/blaze3d/vertex/OverlayVertexConsumer.mapping @@ -12,4 +12,7 @@ CLASS net/minecraft/unmapped/C_hfcesdco com/mojang/blaze3d/vertex/OverlayVertexC FIELD f_tpagfjwz scale F FIELD f_trigfwfe normalY F FIELD f_vpohkwow z F + METHOD (Lnet/minecraft/unmapped/C_igthdzux;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;F)V + ARG 2 cameraMatrix + ARG 3 normalMatrix METHOD m_escfrycr reset ()V diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping index 3f63e474c4..83dd87937a 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -3,7 +3,5 @@ CLASS net/minecraft/unmapped/C_bmtrgtzi net/minecraft/advancement/criterion/Abst METHOD m_fnnxwhdy trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Ljava/util/function/Predicate;)V ARG 1 player ARG 2 predicate - METHOD m_pnmgqjdp conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_ihqmwirx; - ARG 1 json 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 28e73d169d..ae304bf296 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/unmapped/C_ihqmwirx net/minecraft/advancement/criterion/AbstractCriterionConditions FIELD f_nbedpyck id Lnet/minecraft/unmapped/C_ncpywfca; - FIELD f_rljjaeer playerPredicate Lnet/minecraft/unmapped/C_ctsfmifk; - METHOD (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ctsfmifk;)V - ARG 1 id - ARG 2 playerPredicate - METHOD m_gbihezkn getPlayerPredicate ()Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_rljjaeer playerPredicate Ljava/util/Optional; + METHOD m_gbihezkn getPlayerPredicate ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index 5c5f13f0b7..8246884fbc 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_eyqqwstf net/minecraft/advancement/criterion/BeeN METHOD m_yvtehhgq (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_sddaxwyk;ILnet/minecraft/unmapped/C_eyqqwstf$C_vzisdrlj;)Z ARG 3 conditions CLASS C_vzisdrlj Conditions - FIELD f_beqjwoos item Lnet/minecraft/unmapped/C_afravpde; + 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 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_eyqqwstf$C_vzisdrlj; diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index f8ca0dfe91..2bddf43417 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -8,17 +8,9 @@ CLASS net/minecraft/unmapped/C_mvevuwjm net/minecraft/advancement/criterion/Bred ARG 3 partner ARG 4 child CLASS C_avoywuag Conditions - FIELD f_aohytflc parent Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_conlcaee partner Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_uabdygbc child Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_aohytflc parent Ljava/util/Optional; + FIELD f_conlcaee partner Ljava/util/Optional; + FIELD f_uabdygbc child Ljava/util/Optional; METHOD m_dcxauzjq create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_mvevuwjm$C_avoywuag; ARG 0 child METHOD m_etvgtrjz any ()Lnet/minecraft/unmapped/C_mvevuwjm$C_avoywuag; - METHOD m_oueutzzl matches (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;)Z - ARG 1 parentContext - ARG 2 partnerContext - ARG 3 childContext - METHOD m_xtbgnpwc create (Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_mvevuwjm$C_avoywuag; - ARG 0 parent - ARG 1 partner - ARG 2 child diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 1fced54ea1..e9d0dea33e 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -8,8 +8,7 @@ CLASS net/minecraft/unmapped/C_ekmkxenz net/minecraft/advancement/criterion/Chan METHOD m_xvmazyqm (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_iakykpgh; ARG 1 entity CLASS C_hbabyqbh Conditions - FIELD f_jyomajaq victims [Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_jyomajaq victims Ljava/util/List; METHOD m_dfanmuvv matches (Ljava/util/Collection;)Z ARG 1 victims - METHOD m_voeplsts create ([Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_ekmkxenz$C_hbabyqbh; - ARG 0 victims + METHOD m_voeplsts create ([Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_ekmkxenz$C_hbabyqbh; diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index 0c0695ba95..d619591d22 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/unmapped/C_jffbmlem net/minecraft/advancement/criterion/Cons ARG 1 player ARG 2 stack CLASS C_bzfkzlig Conditions - FIELD f_wzmmnlpm item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_wzmmnlpm item Ljava/util/Optional; METHOD m_dlilywub any ()Lnet/minecraft/unmapped/C_jffbmlem$C_bzfkzlig; METHOD m_egkcwcha predicate (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_jffbmlem$C_bzfkzlig; ARG 0 predicate diff --git a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping index 2afac08f39..c949254598 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/unmapped/C_zkhebbek net/minecraft/advancement/criterion/CriterionConditions - METHOD m_ptcoipmh toJson (Lnet/minecraft/unmapped/C_cogtomcl;)Lcom/google/gson/JsonObject; - ARG 1 predicateSerializer + METHOD m_ptcoipmh toJson ()Lcom/google/gson/JsonObject; METHOD m_tcpfarcl getId ()Lnet/minecraft/unmapped/C_ncpywfca; diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index 1a2616b456..3ae812738d 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -7,8 +7,8 @@ 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 Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_rcgapqtf zombie Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_fsqsxjac villager Ljava/util/Optional; + FIELD f_rcgapqtf zombie Ljava/util/Optional; METHOD m_bmzrgsol any ()Lnet/minecraft/unmapped/C_urcewduq$C_izcpkdrl; METHOD m_gshltfwj matches (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh;)Z ARG 1 zombieContext diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index d1275605b7..459e0fd18e 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -6,12 +6,10 @@ CLASS net/minecraft/unmapped/C_frltmexa net/minecraft/advancement/criterion/Effe ARG 1 player ARG 2 source CLASS C_nuklejcd Conditions - FIELD f_mrkuerej effects Lnet/minecraft/unmapped/C_nysuqcvh; - FIELD f_rzrdetbl source Lnet/minecraft/unmapped/C_ctsfmifk; - METHOD m_nhgylwru create (Lnet/minecraft/unmapped/C_nysuqcvh;)Lnet/minecraft/unmapped/C_frltmexa$C_nuklejcd; - ARG 0 effects + 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_frltmexa$C_nuklejcd; 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;)Lnet/minecraft/unmapped/C_frltmexa$C_nuklejcd; - ARG 0 source + METHOD m_yaktkwvf create (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_frltmexa$C_nuklejcd; diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 0bcf827cf8..7f22381fb0 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/unmapped/C_sszdquwf net/minecraft/advancement/criterion/Ench ARG 3 levels CLASS C_kscasjsf Conditions FIELD f_beglylru levels Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_vafjxlah item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_vafjxlah item Ljava/util/Optional; METHOD m_sinvrewi matches (Lnet/minecraft/unmapped/C_sddaxwyk;I)Z ARG 1 stack ARG 2 levels diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index 6ac26de3b8..3396fd4316 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/unmapped/C_rvwlswnk net/minecraft/advancement/criterion/EnterBlockCriterion FIELD f_vzynnjic ID Lnet/minecraft/unmapped/C_ncpywfca; - METHOD m_jagtzaue (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rvwlswnk$C_fcmyqfbr;)Z - ARG 1 conditions 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; @@ -10,7 +8,7 @@ CLASS net/minecraft/unmapped/C_rvwlswnk net/minecraft/advancement/criterion/Ente ARG 1 player ARG 2 state CLASS C_fcmyqfbr Conditions - FIELD f_xkcfevos state Lnet/minecraft/unmapped/C_fsjpkzrx; + 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_rvwlswnk$C_fcmyqfbr; ARG 0 block diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index 4ed0066b48..dd196100cb 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/unmapped/C_vteznemu net/minecraft/advancement/criterion/Enti METHOD m_qzmuqddo (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZLnet/minecraft/unmapped/C_vteznemu$C_qcrjsemd;)Z ARG 5 conditions CLASS C_qcrjsemd Conditions - FIELD f_xvxndxmn damage Lnet/minecraft/unmapped/C_mzdoirue; + FIELD f_xvxndxmn damage Ljava/util/Optional; METHOD m_gztunifz matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)Z ARG 1 player ARG 2 source diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index f703004d6e..528aa7acfc 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -6,8 +6,7 @@ CLASS net/minecraft/unmapped/C_mhaudtdi net/minecraft/advancement/criterion/Fill METHOD m_vktfannh (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_mhaudtdi$C_ewggyutx;)Z ARG 1 conditions CLASS C_ewggyutx Conditions - FIELD f_ypnyleyp item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_ypnyleyp item Ljava/util/Optional; METHOD m_ysuegidl matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack - METHOD m_zksotfnm create (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_mhaudtdi$C_ewggyutx; - ARG 0 item + METHOD m_zksotfnm create (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_mhaudtdi$C_ewggyutx; diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index 1ba07fc0b1..65f28a0c0c 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -8,13 +8,10 @@ CLASS net/minecraft/unmapped/C_wpdvydim net/minecraft/advancement/criterion/Fish ARG 3 bobber ARG 4 fishingLoots CLASS C_mnduyaqi Conditions - FIELD f_nhiyipvg hookedEntity Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_nyxgezpg rod Lnet/minecraft/unmapped/C_afravpde; - FIELD f_yxngcsqu caughtItem Lnet/minecraft/unmapped/C_afravpde; - METHOD m_getqiwnh create (Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_wpdvydim$C_mnduyaqi; - ARG 0 rod - ARG 1 bobber - ARG 2 item + FIELD f_nhiyipvg hookedEntity Ljava/util/Optional; + FIELD f_nyxgezpg rod Ljava/util/Optional; + FIELD f_yxngcsqu caughtItem Ljava/util/Optional; + METHOD m_getqiwnh create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_wpdvydim$C_mnduyaqi; 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/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index b6af9828f8..b5627e75c3 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/unmapped/C_wqesddch net/minecraft/advancement/criterion/Inve CLASS C_bvmbsujf Conditions FIELD f_aeowyycx full Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; FIELD f_gcnlnbms empty Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_hbosewcb items [Lnet/minecraft/unmapped/C_afravpde; + FIELD f_hbosewcb items Ljava/util/List; FIELD f_hugpsiii occupied Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; METHOD m_aucajtyt matches (Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_sddaxwyk;III)Z ARG 1 inventory @@ -26,7 +26,5 @@ CLASS net/minecraft/unmapped/C_wqesddch net/minecraft/advancement/criterion/Inve ARG 5 occupied METHOD m_caxnosuf items ([Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf; ARG 0 items - METHOD m_oxlpraba (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_afravpde;)Z - ARG 1 item METHOD m_ydchjntx items ([Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf; ARG 0 items diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 00d950abb1..b2b7123ca3 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -7,12 +7,9 @@ CLASS net/minecraft/unmapped/C_ekwvzgfo net/minecraft/advancement/criterion/Item ARG 2 stack ARG 3 durability CLASS C_sjpvdygp Conditions - FIELD f_gjjbtgug item Lnet/minecraft/unmapped/C_afravpde; + 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 - METHOD m_vwmdxnji create (Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_ekwvzgfo$C_sjpvdygp; - ARG 0 item - ARG 1 durability diff --git a/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.mapping index 4a82b9db94..947689b585 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/unmapped/C_bvrmpowj net/minecraft/advancement/criterion/Item 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 - METHOD (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ctsfmifk;)V - ARG 1 id diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index e0d80c1a7a..154cd01d40 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/unmapped/C_thhqzygp net/minecraft/advancement/criterion/Kill ARG 2 conditions CLASS C_jbfosyao Conditions FIELD f_vlrsamdh uniqueEntityTypes Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_zeikxwwf victims [Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_zeikxwwf victims Ljava/util/List; METHOD m_bucrxpgl matches (Ljava/util/Collection;I)Z ARG 1 victimContexts ARG 2 uniqueEntityTypeCount diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index a3f062d78f..08022075c7 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/unmapped/C_mhjgbxyr net/minecraft/advancement/criterion/Levi ARG 2 startPos ARG 3 duration CLASS C_kxdzjcen Conditions - FIELD f_hybrirfi distance Lnet/minecraft/unmapped/C_ullximxc; + FIELD f_hybrirfi distance Ljava/util/Optional; FIELD f_kwnokhux duration Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; METHOD m_ckluwaem matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_vgpupfxx;I)Z ARG 1 player diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping index c79995e141..68383087bc 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping @@ -9,11 +9,9 @@ CLASS net/minecraft/unmapped/C_ujdwetcx net/minecraft/advancement/criterion/Ligh METHOD m_sopdckac (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/List;Lnet/minecraft/unmapped/C_ujdwetcx$C_nyevovia;)Z ARG 2 conditions CLASS C_nyevovia Conditions - FIELD f_hvjdwveg lightning Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_ohpkesnc bystander Lnet/minecraft/unmapped/C_ctsfmifk; + 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 ARG 1 lightning ARG 2 bystanders - METHOD m_xwaxbsac create (Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_ujdwetcx$C_nyevovia; - ARG 0 lightning - ARG 1 bystander + METHOD m_xwaxbsac create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_ujdwetcx$C_nyevovia; diff --git a/mappings/net/minecraft/advancement/criterion/LocationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LocationCriterion.mapping index 07efb8d606..74b1443c59 100644 --- a/mappings/net/minecraft/advancement/criterion/LocationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LocationCriterion.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/unmapped/C_maikngon net/minecraft/advancement/criterion/Loca METHOD m_qjisaduw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;)V ARG 1 player CLASS C_zsxskcab Conditions - METHOD m_enfvbgsy createLocation (Lnet/minecraft/unmapped/C_ypvebgnl;)Lnet/minecraft/unmapped/C_maikngon$C_zsxskcab; - ARG 0 location METHOD m_eyeihplq checkFootwearAndBlock (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_maikngon$C_zsxskcab; ARG 0 block ARG 1 item @@ -16,5 +14,3 @@ CLASS net/minecraft/unmapped/C_maikngon net/minecraft/advancement/criterion/Loca METHOD m_hmvkkudn createHeroOfTheVillage ()Lnet/minecraft/unmapped/C_maikngon$C_zsxskcab; METHOD m_qwkcggdj createTick ()Lnet/minecraft/unmapped/C_maikngon$C_zsxskcab; METHOD m_ttuubwul createInBed ()Lnet/minecraft/unmapped/C_maikngon$C_zsxskcab; - METHOD m_ueuglivy createEntity (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_maikngon$C_zsxskcab; - ARG 0 entity diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index c05717508c..fe65a89ea0 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -9,42 +9,20 @@ CLASS net/minecraft/unmapped/C_hqkuepng net/minecraft/advancement/criterion/OnKi 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 Lnet/minecraft/unmapped/C_pbkrjvwn; - FIELD f_lxfposld entity Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_fzpobeto killingBlow Ljava/util/Optional; + FIELD f_lxfposld entity Ljava/util/Optional; METHOD m_drselnfh createPlayerKilledEntity (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; ARG 0 killedEntityPredicateBuilder ARG 1 killingBlowBuilder - METHOD m_eslkvaly createEntityKilledPlayer (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_pbkrjvwn;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killerEntityPredicateBuilder - ARG 1 damageSourcePredicate METHOD m_fjosalke createPlayerKilledEntity (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; ARG 0 killedEntityPredicateBuilder METHOD m_gvsemipa createPlayerKilledEntityNearSculkCatalyst ()Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; METHOD m_ivcwefgb createEntityKilledPlayer ()Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - METHOD m_kgljjunj createPlayerKilledEntity (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killedEntityPredicate 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 - METHOD m_mffpmgbi createEntityKilledPlayer (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killerEntityPredicate - METHOD m_nzqecuew createPlayerKilledEntity (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_pbkrjvwn;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killedEntityPredicateBuilder - ARG 1 damageSourcePredicate - METHOD m_orbsqgoj createPlayerKilledEntity (Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killedEntityPredicate - ARG 1 damageSourcePredicateBuilder METHOD m_sxxsmbbc createPlayerKilledEntity ()Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - METHOD m_vaeyhzne createEntityKilledPlayer (Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_pbkrjvwn;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killerEntityPredicate - ARG 1 damageSourcePredicate - METHOD m_xktgjabw createEntityKilledPlayer (Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killerEntityPredicate - ARG 1 damageSourcePredicateBuilder - METHOD m_zbavytbg createPlayerKilledEntity (Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_pbkrjvwn;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; - ARG 0 killedEntityPredicate - ARG 1 damageSourcePredicate METHOD m_znprdvgs createEntityKilledPlayer (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; ARG 0 killerEntityPredicateBuilder METHOD m_zuzgvrpl createEntityKilledPlayer (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw; diff --git a/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.mapping index 5b36600993..12b19547ae 100644 --- a/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.mapping @@ -9,13 +9,11 @@ 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 Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_ojlhqcvr item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_arggadrw pickedUp 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 ARG 1 player ARG 2 stack ARG 3 context - METHOD m_rdzxqeho createPickedUpByEntity (Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_ctsfmifk;)Lnet/minecraft/unmapped/C_mntpixlf$C_oqopxfol; - ARG 1 item - METHOD m_tcywlilh createPickedUpByPlayer (Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_ctsfmifk;)Lnet/minecraft/unmapped/C_mntpixlf$C_oqopxfol; - ARG 1 item + METHOD m_rdzxqeho createPickedUpByEntity (Lnet/minecraft/unmapped/C_ctsfmifk;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_mntpixlf$C_oqopxfol; + METHOD m_tcywlilh createPickedUpByPlayer (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_mntpixlf$C_oqopxfol; diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index a97fa50395..79977f53a7 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -10,8 +10,8 @@ CLASS net/minecraft/unmapped/C_cufgrabk net/minecraft/advancement/criterion/Play ARG 5 taken ARG 6 blocked CLASS C_eldrleys Conditions - FIELD f_ttvdtidt damage Lnet/minecraft/unmapped/C_mzdoirue; - FIELD f_yqisamch entity Lnet/minecraft/unmapped/C_ctsfmifk; + 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 @@ -19,16 +19,4 @@ CLASS net/minecraft/unmapped/C_cufgrabk net/minecraft/advancement/criterion/Play ARG 4 dealt ARG 5 taken ARG 6 blocked - METHOD m_jwkwnhhu create (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_cufgrabk$C_eldrleys; - ARG 0 damagePredicateBuilder - ARG 1 hurtEntityPredicate - METHOD m_moatmwqp create (Lnet/minecraft/unmapped/C_mzdoirue;)Lnet/minecraft/unmapped/C_cufgrabk$C_eldrleys; - ARG 0 damagePredicate - METHOD m_oucklpiu create (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;)Lnet/minecraft/unmapped/C_cufgrabk$C_eldrleys; - ARG 0 damagePredicateBuilder METHOD m_oyqesidm create ()Lnet/minecraft/unmapped/C_cufgrabk$C_eldrleys; - METHOD m_sllhrzli create (Lnet/minecraft/unmapped/C_mzdoirue;Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_cufgrabk$C_eldrleys; - ARG 0 damagePredicate - ARG 1 hurtEntityPredicate - METHOD m_wyspnoxw create (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_cufgrabk$C_eldrleys; - ARG 0 hurtEntityPredicate diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index 29b3ae7c51..269d9bc1bb 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/unmapped/C_bvljsgzr net/minecraft/advancement/criterion/Play ARG 2 stack ARG 3 entity CLASS C_dwldgxex Conditions - FIELD f_dzdeopor entity Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_vnlyypoa item Lnet/minecraft/unmapped/C_afravpde; + 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/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping index 146c38bcf2..0da6cd6c6f 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -7,8 +7,5 @@ CLASS net/minecraft/unmapped/C_thfyxhzz net/minecraft/advancement/criterion/Reci CLASS C_fznnyxkh Conditions FIELD f_afckjgza predicates Ljava/util/List; FIELD f_tliwdtji recipeId Lnet/minecraft/unmapped/C_ncpywfca; - METHOD (Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V - ARG 2 recipeId - ARG 3 predicates METHOD m_srqmbfmi (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)Z ARG 2 stacks diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index 4bf7093116..e70102d91c 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -6,10 +6,8 @@ CLASS net/minecraft/unmapped/C_ucuoichm net/minecraft/advancement/criterion/Shot METHOD m_oapyhtkk (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_ucuoichm$C_pjsuhcqx;)Z ARG 1 conditions CLASS C_pjsuhcqx Conditions - FIELD f_jjugdvgn item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_jjugdvgn item Ljava/util/Optional; METHOD m_amuocayq matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack METHOD m_esewqsys create (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_ucuoichm$C_pjsuhcqx; ARG 0 item - METHOD m_oqdgmvss create (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_ucuoichm$C_pjsuhcqx; - ARG 0 itemPredicate diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index 2746c60176..ea63457681 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -4,13 +4,11 @@ CLASS net/minecraft/unmapped/C_guvqoceu net/minecraft/advancement/criterion/Slid ARG 1 key METHOD m_kcppupqo getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_mmxmpdoq; ARG 0 root - METHOD m_xpgxtpso (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 Lnet/minecraft/unmapped/C_fsjpkzrx; + FIELD f_lnvqlhga state Ljava/util/Optional; FIELD f_yazmngap block Lnet/minecraft/unmapped/C_mmxmpdoq; METHOD m_bovizfbr create (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_guvqoceu$C_rzzwrqgc; ARG 0 block diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index 04a0d11147..1bd342fe91 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/unmapped/C_ckqxcepo net/minecraft/advancement/criterion/Summ METHOD m_prrnnsyk (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_ckqxcepo$C_rpttlyon;)Z ARG 1 conditions CLASS C_rpttlyon Conditions - FIELD f_ljocxpgb entity Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_ljocxpgb entity Ljava/util/Optional; METHOD m_fnicjlur create (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_ckqxcepo$C_rpttlyon; ARG 0 summonedEntityPredicateBuilder METHOD m_hqigeatb matches (Lnet/minecraft/unmapped/C_iakykpgh;)Z diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 2e8ab865c3..d3cffd212b 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -6,9 +6,7 @@ CLASS net/minecraft/unmapped/C_aaelkaim net/minecraft/advancement/criterion/Tame METHOD m_yeelvcwo (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_aaelkaim$C_sbyfjkts;)Z ARG 1 conditions CLASS C_sbyfjkts Conditions - FIELD f_ikjlnsry entity Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_ikjlnsry entity Ljava/util/Optional; METHOD m_abapfmom matches (Lnet/minecraft/unmapped/C_iakykpgh;)Z ARG 1 tamedEntityContext - METHOD m_pfucarwo create (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_aaelkaim$C_sbyfjkts; - ARG 0 entity METHOD m_whuknbez any ()Lnet/minecraft/unmapped/C_aaelkaim$C_sbyfjkts; diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index 4ee5172437..3bc9c4ad76 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -8,11 +8,11 @@ CLASS net/minecraft/unmapped/C_vqqxzpxi net/minecraft/advancement/criterion/Targ METHOD m_kxfarbzh (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_vgpupfxx;ILnet/minecraft/unmapped/C_vqqxzpxi$C_xwywjnst;)Z ARG 3 conditions CLASS C_xwywjnst Conditions - FIELD f_cpwrcmak projectile Lnet/minecraft/unmapped/C_ctsfmifk; + FIELD f_cpwrcmak projectile Ljava/util/Optional; FIELD f_sxrknjfh signalStrength Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; 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_sfzxnxxw create (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_ctsfmifk;)Lnet/minecraft/unmapped/C_vqqxzpxi$C_xwywjnst; + METHOD m_sfzxnxxw create (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_vqqxzpxi$C_xwywjnst; ARG 0 signalStrength diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index 615a3c397d..63fa0f38f3 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/unmapped/C_ntathoag net/minecraft/advancement/criterion/Trav ARG 1 player ARG 2 startPos CLASS C_mnjnxtmp Conditions - FIELD f_jsyyvijr distance Lnet/minecraft/unmapped/C_ullximxc; - FIELD f_pvjxuhms startPos Lnet/minecraft/unmapped/C_ypvebgnl; + FIELD f_jsyyvijr distance Ljava/util/Optional; + FIELD f_pvjxuhms startPos Ljava/util/Optional; METHOD m_bjnhyqsd netherTravel (Lnet/minecraft/unmapped/C_ullximxc;)Lnet/minecraft/unmapped/C_ntathoag$C_mnjnxtmp; ARG 0 distance METHOD m_pbiixtvj rideEntityInLava (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_ullximxc;)Lnet/minecraft/unmapped/C_ntathoag$C_mnjnxtmp; @@ -19,7 +19,6 @@ CLASS net/minecraft/unmapped/C_ntathoag net/minecraft/advancement/criterion/Trav ARG 1 world ARG 2 startPos ARG 3 endPos - METHOD m_zmhmpfzx fallFromHeight (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;Lnet/minecraft/unmapped/C_ullximxc;Lnet/minecraft/unmapped/C_ypvebgnl;)Lnet/minecraft/unmapped/C_ntathoag$C_mnjnxtmp; + 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_ntathoag$C_mnjnxtmp; 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/UsedEnderEyeCriterion.mapping index 76de3c4883..9aefb77049 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -7,7 +7,5 @@ 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 (Lnet/minecraft/unmapped/C_ctsfmifk;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)V - ARG 2 distance 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/UsedTotemCriterion.mapping index 496de4298f..1ee28fcb92 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/unmapped/C_clwnikrb net/minecraft/advancement/criterion/Used ARG 1 player ARG 2 stack CLASS C_xpcxkzoa Conditions - FIELD f_plunrfjp item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_plunrfjp item Ljava/util/Optional; METHOD m_dnoonjxi create (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_clwnikrb$C_xpcxkzoa; ARG 0 item METHOD m_emvfqcea matches (Lnet/minecraft/unmapped/C_sddaxwyk;)Z diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping index 79d0c45317..bc08a5f650 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/unmapped/C_jtrqmgsq net/minecraft/advancement/criterion/Usin ARG 1 player ARG 2 stack CLASS C_nenbghty Conditions - FIELD f_byhygkwo item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_byhygkwo item Ljava/util/Optional; 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_jtrqmgsq$C_nenbghty; diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index 16de4e35cd..f9ddf017b4 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/unmapped/C_yddyhqpp net/minecraft/advancement/criterion/Vill ARG 2 merchant ARG 3 stack CLASS C_roruwsnz Conditions - FIELD f_bdcnndjx villager Lnet/minecraft/unmapped/C_ctsfmifk; - FIELD f_ctaaopnz item Lnet/minecraft/unmapped/C_afravpde; + FIELD f_bdcnndjx villager Ljava/util/Optional; + FIELD f_ctaaopnz item Ljava/util/Optional; METHOD m_ejngplad matches (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 merchantContext ARG 2 stack diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 2c3017a5a6..266038f3d9 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/unmapped/C_zhojkkij net/minecraft/block/FlowerBlock FIELD f_bfitumpo SHAPE_OFFSET F - FIELD f_bhseogjj stewEffectDuration I - FIELD f_kercppyn stewEffect Lnet/minecraft/unmapped/C_jaqasomh; FIELD f_lmxyscfa SHAPE Lnet/minecraft/unmapped/C_zscvhwbd; METHOD (Lnet/minecraft/unmapped/C_jaqasomh;ILnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V ARG 1 suspiciousStewEffect diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 7bdef2a4dc..8fe5ea2f86 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -37,8 +37,6 @@ CLASS net/minecraft/unmapped/C_wwadquuj net/minecraft/block/entity/BeaconBlockEn ARG 2 y ARG 3 z METHOD m_nfnxayia getBeamSegments ()Ljava/util/List; - METHOD m_rkcvjkjn getPotionEffectById (I)Lnet/minecraft/unmapped/C_jaqasomh; - ARG 0 id METHOD m_uspuntja playSound (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_avavozay;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 17b8ad2275..703d0d0818 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -48,7 +48,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient FIELD f_asaufriy currentFrameProfile Lnet/minecraft/unmapped/C_nwvkrkad$C_flvqvwqj; FIELD f_bckuoycd musicTracker Lnet/minecraft/unmapped/C_bqcuvynv; FIELD f_bcynorao server Lnet/minecraft/unmapped/C_mxzbwazq; - FIELD f_beylhheg sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap; FIELD f_bjcsaqmm socialInteractionsToast Lnet/minecraft/unmapped/C_fbzposnd; FIELD f_bwktqbao playerKeyPairManager Lnet/minecraft/unmapped/C_huqpbmju; FIELD f_bzlzxgjd tutorialManager Lnet/minecraft/unmapped/C_eqosojcf; @@ -121,7 +120,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient FIELD f_jdwcaqvb guiAtlasManager Lnet/minecraft/unmapped/C_ihnghycr; FIELD f_jgndswme attackCooldown I FIELD f_juejclec worldStorage Lnet/minecraft/unmapped/C_bpwagnit; - FIELD f_jztrpgfi metricsData Lnet/minecraft/unmapped/C_hqvvtxmh; FIELD f_kgwygzao COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD f_kknqnaxx resourcePackDir Ljava/nio/file/Path; FIELD f_kxvfpczt paused Z @@ -188,15 +186,12 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient FIELD f_zeykonab tickTimeTracker Lnet/minecraft/unmapped/C_trqmdcbh; FIELD f_zjjxgdei crashReport Ljava/util/function/Supplier; FIELD f_zkyftfub framebuffer Lnet/minecraft/unmapped/C_xxwgvelc; - FIELD f_zmsovtel connectedToRealms Z FIELD f_znfujtma resourceManager Lnet/minecraft/unmapped/C_wdclgdrj; FIELD f_zrhophkf crosshairTarget Lnet/minecraft/unmapped/C_eetoegzn; FIELD f_zwvcmobz inGameHud Lnet/minecraft/unmapped/C_nepwsmgw; FIELD f_zypmqoqf SOCIAL_INTERACTIONS_NOT_AVAILABLE Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD (Lnet/minecraft/unmapped/C_pdsiuywi;)V ARG 1 args - METHOD m_aaltpyph (Ljava/util/Optional;)V - ARG 1 optional METHOD m_abvhsfhz isInSingleplayer ()Z METHOD m_adlanxiy getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; METHOD m_aehcbacb getWorldStorage ()Lnet/minecraft/unmapped/C_bpwagnit; @@ -220,10 +215,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient METHOD m_cbjyfsge refreshSearch (Lnet/minecraft/unmapped/C_zqzigdge$C_gvofkqkn;Ljava/util/List;)V ARG 1 key ARG 2 searchables - METHOD m_ccoxkwrp (Ljava/util/function/Consumer;Ljava/nio/file/Path;)V - ARG 1 path - METHOD m_cfkdcloy (Z)V - ARG 1 confirmed METHOD m_cfvjiijv cancelRecorder ()V METHOD m_crapepyd getEntityModelLoader ()Lnet/minecraft/unmapped/C_qncyfzro; METHOD m_cwwicafr isSingleplayer ()Z @@ -257,30 +248,19 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient COMMENT will be called on it to notify it of the closing. ARG 1 screen COMMENT the new screen, or {@code null} to just close the previous screen - METHOD m_egnlfyjl (Ljava/util/List;)Lnet/minecraft/unmapped/C_wvjmuhfo; - ARG 0 list METHOD m_egpifpov isOptionalTelemetryEnabled ()Z - METHOD m_ejicmrfw (Ljava/lang/String;)Z - ARG 0 string - METHOD m_eqymcyun (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_dzczqjri;)V - ARG 2 result - METHOD m_exakjteb getSessionProperties ()Lcom/mojang/authlib/properties/PropertyMap; - METHOD m_faatluqx (Ljava/util/List;)V + METHOD m_faatluqx (Ljava/util/List;)Lnet/minecraft/unmapped/C_wvjmuhfo; ARG 0 stacks ARG 1 list METHOD m_fblebkis getSkinProvider ()Lnet/minecraft/unmapped/C_pyciilvf; METHOD m_fcdeiybw toggleDebugProfiler (Ljava/util/function/Consumer;)Z ARG 1 chatMessageSender - METHOD m_fctndloq (Lnet/minecraft/unmapped/C_rdaqiwdt;)Ljava/lang/String; - ARG 0 text METHOD m_feekilwg isCurrentPlayer (Ljava/util/UUID;)Z METHOD m_fnnphfvj getEntityRenderDispatcher ()Lnet/minecraft/unmapped/C_gmkqxljo; METHOD m_fquuldng isPaused ()Z METHOD m_fsvbdqcr getResourcePackDir ()Ljava/nio/file/Path; METHOD m_futlsgwc getWorldGenerationProgressTracker ()Lnet/minecraft/unmapped/C_qtaaqxsg; METHOD m_fvpjtpsc updateWindowTitle ()V - METHOD m_fweiciji (ZLjava/util/concurrent/CompletableFuture;Ljava/util/Optional;)V - ARG 3 exceptionOptional METHOD m_gbdqzmqi getGameVersion ()Ljava/lang/String; METHOD m_gjlephcr setCameraEntity (Lnet/minecraft/unmapped/C_astfners;)V ARG 1 entity @@ -305,29 +285,18 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient METHOD m_hnadsrtd getFrameTime ()J METHOD m_hpnybqgx getPaintingManager ()Lnet/minecraft/unmapped/C_kotvulld; METHOD m_hwuesuuy getProfiler ()Lnet/minecraft/unmapped/C_eslcbfsq; - METHOD m_hytombqw getMetricsData ()Lnet/minecraft/unmapped/C_hqvvtxmh; METHOD m_igshcbgp setMipmapLevels (I)V ARG 1 mipmapLevels METHOD m_imhnyksl getWindow ()Lnet/minecraft/unmapped/C_snosbckc; METHOD m_iuvifafs getDefaultResourcePack ()Lnet/minecraft/unmapped/C_qauewsos; - METHOD m_iuyrgzvf (Lnet/minecraft/unmapped/C_ymmazfhq;Lnet/minecraft/unmapped/C_awrmdwqd;)Ljava/util/stream/Stream; - ARG 1 recipe - METHOD m_ixfyrqov (Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lnet/minecraft/unmapped/C_dqfyacfy;Lnet/minecraft/unmapped/C_tljyhzqp;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/lang/Thread;)Lnet/minecraft/unmapped/C_mxzbwazq; - ARG 5 thread - METHOD m_ixydweer (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; - ARG 0 future METHOD m_jctsnpmo getBlockEntityRenderDispatcher ()Lnet/minecraft/unmapped/C_sicqxpzm; METHOD m_jgfcfpip isOptionalTelemetryAvailable ()Z METHOD m_jiouzlzi getServer ()Lnet/minecraft/unmapped/C_mxzbwazq; COMMENT Gets this client's own integrated server. COMMENT COMMENT

The integrated server is only present when a local single player world is open. - METHOD m_jksiigrm (Lnet/minecraft/unmapped/C_fprbxnfr;Ljava/util/function/Consumer;Ljava/util/List;)V - ARG 3 files METHOD m_jtfycguy getVersionType ()Ljava/lang/String; METHOD m_jvlajuse onGameLoaded ()V - METHOD m_jytofnym (Lnet/minecraft/unmapped/C_dzczqjri;)V - ARG 0 profileResult METHOD m_jytpvdsa countryEqualsISO3 (Ljava/lang/Object;)Z ARG 0 o METHOD m_kclqbfew cleanUpAfterCrash ()V @@ -347,10 +316,8 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 2 languageManager ARG 3 version ARG 4 options - METHOD m_lojsiqav (Lnet/minecraft/unmapped/C_ymmazfhq;)Ljava/util/stream/Stream; + METHOD m_lojsiqav (Lnet/minecraft/unmapped/C_ymmazfhq;Lnet/minecraft/unmapped/C_awrmdwqd;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 0 resultCollection - METHOD m_lvwgqwxn (Ljava/util/List;)Lnet/minecraft/unmapped/C_wvjmuhfo; - ARG 0 list METHOD m_lwpmozmo getNetworkProxy ()Ljava/net/Proxy; METHOD m_mgwfxoza getModStatus ()Lnet/minecraft/unmapped/C_wlkuksof; METHOD m_mkztxxaq getRemoteResourcePackProvider ()Lnet/minecraft/unmapped/C_aqwrwsxs; @@ -358,8 +325,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 1 stack ARG 2 blockEntity METHOD m_mmruqhcv scheduleStop ()V - METHOD m_modhymrw (ZLjava/lang/Throwable;)V - ARG 2 exception METHOD m_mqdbnddk handleInputEvents ()V METHOD m_ngtmdbml startIntegratedServer (Ljava/lang/String;Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lnet/minecraft/unmapped/C_dqfyacfy;Lnet/minecraft/unmapped/C_tljyhzqp;Z)V ARG 1 worldId @@ -398,13 +363,7 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 3 options ARG 4 report METHOD m_pfleqtyk getVideoWarningManager ()Lnet/minecraft/unmapped/C_giiyufuh; - METHOD m_popsxyee (Ljava/lang/String;)Z - ARG 0 string - METHOD m_potaagxt (Lnet/minecraft/unmapped/C_rdaqiwdt;)V - ARG 0 text METHOD m_ppqcqqyo stopRecorder ()V - METHOD m_ppuzvmar (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism; - ARG 1 style METHOD m_ppypuskf displayPackLoadFailureToast (Lnet/minecraft/unmapped/C_rdaqiwdt;)V ARG 1 message METHOD m_ptakjikv getOverlay ()Lnet/minecraft/unmapped/C_gtnnbmai; @@ -424,16 +383,10 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 3 unitHeight ARG 4 width ARG 5 height - METHOD m_qitbpodu (Lnet/minecraft/unmapped/C_rdaqiwdt;)Ljava/lang/String; - ARG 0 text - METHOD m_qnboulpj (Ljava/util/function/Consumer;Ljava/nio/file/Path;)V - ARG 2 path METHOD m_qozcjtsz setInitialScreen (Lnet/minecraft/unmapped/C_ivysvyzf;Lnet/minecraft/unmapped/C_dzecaeok;Lnet/minecraft/unmapped/C_pdsiuywi$C_ztbvorvu;)V ARG 1 realmsClient ARG 2 resourceReload ARG 3 quickPlay - METHOD m_qpjbceeh (Ljava/util/List;)Lnet/minecraft/unmapped/C_wvjmuhfo; - ARG 0 list METHOD m_qumbuvds getBufferBuilders ()Lnet/minecraft/unmapped/C_dfmwjguw; METHOD m_qzdvutlp getResourceManager ()Lnet/minecraft/unmapped/C_tmnrpasf; METHOD m_reukrcbm getTutorialManager ()Lnet/minecraft/unmapped/C_eqosojcf; @@ -446,16 +399,12 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 2 width ARG 3 height METHOD m_rofjwsoe getQuickPlayLogger ()Lnet/minecraft/unmapped/C_plekrknb; - METHOD m_rsavxtdp (Ljava/io/File;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism; - ARG 1 style METHOD m_rzjpaaju doAttack ()Z METHOD m_rzmoptef doItemPick ()V METHOD m_sbqagrpz getBanDetails ()Lcom/mojang/authlib/minecraft/BanDetails; METHOD m_sgqznkcg getLastInputType ()Lnet/minecraft/unmapped/C_qdenxghm; METHOD m_sgsxylrl getItemRenderer ()Lnet/minecraft/unmapped/C_xjqetogb; METHOD m_skbwigbs doItemUse ()V - METHOD m_sklunwdl (Lnet/minecraft/unmapped/C_rdaqiwdt;)V - ARG 0 text METHOD m_slhezzjr reloadResources (Z)Ljava/util/concurrent/CompletableFuture; COMMENT Reloads the client's resources. COMMENT @@ -463,8 +412,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 1 force COMMENT {@code true} if the resource reloading should be forced, or {@code false} otherwise METHOD m_smodvonk getSoundManager ()Lnet/minecraft/unmapped/C_hfmtwavd; - METHOD m_snpfnggq (I)Lnet/minecraft/unmapped/C_jnfclwgd; - ARG 1 radius METHOD m_soplzpsv shouldShowBanNotice ()Z METHOD m_ssowzzsw shouldRenderAsync ()Z METHOD m_stbazwpo initFont (Z)V @@ -476,8 +423,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 2 resourceName METHOD m_tiwzsgum handleResourceReloadException (Ljava/lang/Throwable;)V ARG 1 exception - METHOD m_tqtftbvu (Lnet/minecraft/unmapped/C_ivysvyzf;Lnet/minecraft/unmapped/C_dzecaeok;Lnet/minecraft/unmapped/C_pdsiuywi;Z)V - ARG 4 confirmed METHOD m_txocaejx startOnlineMode ()V METHOD m_ubufromq getSpriteAtlas (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/function/Function; ARG 1 id @@ -489,8 +434,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient ARG 1 active ARG 2 monitor METHOD m_uhuiglxr isHudEnabled ()Z - METHOD m_uneueilo (Lnet/minecraft/unmapped/C_ymmazfhq;Lnet/minecraft/unmapped/C_awrmdwqd;)Lnet/minecraft/unmapped/C_ncpywfca; - ARG 1 recipe METHOD m_upqckqnd getBakedModelManager ()Lnet/minecraft/unmapped/C_wosoicga; METHOD m_usvofotc getCameraEntity ()Lnet/minecraft/unmapped/C_astfners; METHOD m_uubvcnee isRunning ()Z @@ -502,10 +445,8 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient METHOD m_wgjcxgcz getRealmsDataFetcher ()Lnet/minecraft/unmapped/C_yyprjalz; METHOD m_wipirsgk getInstance ()Lnet/minecraft/unmapped/C_ayfeobid; METHOD m_wkcnjoym isMultiplayerEnabled ()Z - METHOD m_wlckrozy (Lnet/minecraft/unmapped/C_ymmazfhq;)Ljava/util/stream/Stream; - ARG 0 resultCollection - METHOD m_wmmoabhh (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_dzczqjri;)V - ARG 2 profileResult + METHOD m_wmmoabhh (Lnet/minecraft/unmapped/C_dzczqjri;)V + ARG 0 profileResult METHOD m_wnvdggdb shouldMonitorTickDuration ()Z METHOD m_xlacueca getChatListener ()Lnet/minecraft/unmapped/C_bmbrcost; METHOD m_xsnthzsp getNetworkHandler ()Lnet/minecraft/unmapped/C_nuofrxvi; @@ -518,8 +459,6 @@ CLASS net/minecraft/unmapped/C_ayfeobid net/minecraft/client/MinecraftClient METHOD m_yyiisqrp isWindowFocused ()Z METHOD m_zdhaikmf isRealmsEnabled ()Z METHOD m_zewjnqja exitToTitleScreen ()V - METHOD m_zfxtwhnc (Ljava/io/File;Lnet/minecraft/unmapped/C_cpwnhism;)Lnet/minecraft/unmapped/C_cpwnhism; - ARG 1 style METHOD m_zguhyzcv getLanguageManager ()Lnet/minecraft/unmapped/C_dahbfdem; METHOD m_zllnrifa isFancyGraphicsOrBetter ()Z METHOD m_zrwzcbyc getBlockColors ()Lnet/minecraft/unmapped/C_iiyegykq; diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 9023ddb064..1cea4b5007 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -2,14 +2,11 @@ CLASS net/minecraft/unmapped/C_epxplegp net/minecraft/client/gui/hud/DebugHud FIELD f_demcwxlr client Lnet/minecraft/unmapped/C_ayfeobid; FIELD f_fjhfdzhz HEIGHT_MAP_TYPES Ljava/util/Map; FIELD f_hdjainem fluidHit Lnet/minecraft/unmapped/C_eetoegzn; - FIELD f_ngtjpoli GREEN I FIELD f_nivhpjpa TEXT_COLOR I FIELD f_qympybag allocationRateCalculator Lnet/minecraft/unmapped/C_epxplegp$C_itbnpmom; FIELD f_rmhsdqts MARGIN_LEFT I FIELD f_tekegaef MARGIN_RIGHT I - FIELD f_tmyjlgxh YELLOW I FIELD f_unrhvpxp MARGIN_TOP I - FIELD f_uowbcnsu RED I FIELD f_uzvvfrgc pos Lnet/minecraft/unmapped/C_ynrszrtu; FIELD f_vbjupvgy blockHit Lnet/minecraft/unmapped/C_eetoegzn; FIELD f_vmhafjuy chunk Lnet/minecraft/unmapped/C_hrdsvlkq; @@ -19,12 +16,6 @@ CLASS net/minecraft/unmapped/C_epxplegp net/minecraft/client/gui/hud/DebugHud ARG 1 client METHOD m_ayfaebbc renderLeftText (Lnet/minecraft/unmapped/C_sedilmty;)V ARG 1 graphics - METHOD m_biikzvpa drawMetricsData (Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_hqvvtxmh;IIZ)V - ARG 1 graphics - ARG 2 metricsData - ARG 3 x - ARG 4 width - ARG 5 showFps METHOD m_bwbghmzt renderText (Lnet/minecraft/unmapped/C_sedilmty;Ljava/util/List;Z)V ARG 2 lines ARG 3 leftSide @@ -44,15 +35,6 @@ CLASS net/minecraft/unmapped/C_epxplegp net/minecraft/client/gui/hud/DebugHud ARG 0 tag METHOD m_orhmyoww (Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/lang/String; ARG 0 tag - METHOD m_pqezogof interpolateColor (IIF)I - ARG 1 color1 - ARG 2 color2 - ARG 3 dt - METHOD m_qsqzxlle getMetricsLineColor (IIII)I - ARG 1 value - ARG 2 greenValue - ARG 3 yellowValue - ARG 4 redValue METHOD m_sgnauvaj getBiomeString (Lnet/minecraft/unmapped/C_cjzoxshv;)Ljava/lang/String; ARG 0 biome METHOD m_shsitysu (Ljava/util/EnumMap;)V diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index 43b8baa4ee..28544a64dc 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -1,10 +1,7 @@ CLASS net/minecraft/unmapped/C_djvyunwn net/minecraft/client/gui/widget/ScrollableWidget COMMENT A widget that can be focused and vertically scrolled. - FIELD f_awqtdtsd UNFOCUSED_BORDER_COLOR I FIELD f_dbzjuacb scrollbarDragged Z - FIELD f_djpqddjv BOX_BACKGROUND_COLOR I FIELD f_kciammnc scrollAmount D - FIELD f_mtmzekuk FOCUSED_BORDER_COLOR I FIELD f_uajaeyqh INNER_PADDING I METHOD m_arnarrjg getTotalInnerPadding ()I METHOD m_eucbjkoi renderContents (Lnet/minecraft/unmapped/C_sedilmty;IIF)V diff --git a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping index 4f5e479fb2..e12e1ccb8e 100644 --- a/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/SliderWidget.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/unmapped/C_mnmxzygo net/minecraft/client/gui/widget/SliderWidget - FIELD f_byevpdqn HEIGHT I FIELD f_gdhkiaak HANDLE_WIDTH I FIELD f_nqjsekiq mutable Z FIELD f_ufyjhhcg value D diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index ea79a77e08..372fe8a6a4 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -3,12 +3,10 @@ CLASS net/minecraft/unmapped/C_vopzcnhf net/minecraft/client/gui/widget/TextFiel FIELD f_avkvsjop changedListener Ljava/util/function/Consumer; FIELD f_cmnauqqj FORWARDS I FIELD f_ehdqdocj INSERT_CURSOR_COLOR I - FIELD f_etbuuexw BORDER_COLOR_FOCUSED I FIELD f_flvepgtg hint Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_gcohdxnw drawsBackground Z FIELD f_gizvhnzb INSERT_CURSOR_WIDTH I FIELD f_gyakfjgb uneditableColor I - FIELD f_hhuhbjwm BACKGROUND_COLOR I FIELD f_imtjinqy focusUnlocked Z FIELD f_kwetnhqz BACKWARDS I FIELD f_kwuxvwmh DEFAULT_EDITABLE_COLOR I @@ -20,7 +18,6 @@ CLASS net/minecraft/unmapped/C_vopzcnhf net/minecraft/client/gui/widget/TextFiel FIELD f_rpfmfdmz text Ljava/lang/String; FIELD f_sgjqcrpx renderTextProvider Ljava/util/function/BiFunction; FIELD f_txtjhjhm textRenderer Lnet/minecraft/unmapped/C_mavozmpp; - FIELD f_uacbcygj BORDER_COLOR I FIELD f_umkngaml editableColor I FIELD f_yfmhkwpd selectionStart I FIELD f_zsmogpnp editable Z diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index cd85e88983..bac37f8086 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -50,12 +50,6 @@ CLASS net/minecraft/unmapped/C_knluxkhz net/minecraft/client/realms/gui/screen/R ARG 1 tooltip METHOD m_gywvuraq (Lnet/minecraft/unmapped/C_buwziidm;)V ARG 1 button - METHOD m_hjhyapgw drawExpiring (Lnet/minecraft/unmapped/C_sedilmty;IIIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 remainingDays METHOD m_hrdlyycr addSlotButton (I)Lnet/minecraft/unmapped/C_grgwuykf; ARG 1 slotIndex METHOD m_hvhsrgtm (Lnet/minecraft/unmapped/C_buwziidm;)V @@ -66,11 +60,6 @@ CLASS net/minecraft/unmapped/C_knluxkhz net/minecraft/client/realms/gui/screen/R ARG 3 confirmed METHOD m_jufbpfgs fetchServerData (J)V ARG 1 worldId - METHOD m_jxmpxrmp drawExpired (Lnet/minecraft/unmapped/C_sedilmty;IIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD m_kpyrjjpx (Lnet/minecraft/unmapped/C_buwziidm;)V ARG 1 button METHOD m_ktlsinpp isMinigame ()Z @@ -98,11 +87,6 @@ CLASS net/minecraft/unmapped/C_knluxkhz net/minecraft/client/realms/gui/screen/R ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD m_ucsdapcl drawOpen (Lnet/minecraft/unmapped/C_sedilmty;IIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD m_uddgsfrj backButtonClicked ()V METHOD m_uzmgjhyn (Lnet/minecraft/unmapped/C_buwziidm;)V ARG 1 button @@ -114,10 +98,5 @@ CLASS net/minecraft/unmapped/C_knluxkhz net/minecraft/client/realms/gui/screen/R ARG 1 template METHOD m_xergjsvk saveSlotSettings (Lnet/minecraft/unmapped/C_wbvlbazq;)V ARG 1 options - METHOD m_xzjpdzpr drawClosed (Lnet/minecraft/unmapped/C_sedilmty;IIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD m_zeyczyyy removeButton (Lnet/minecraft/unmapped/C_buwziidm;)V ARG 1 button diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 070dcc1165..db43429841 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -58,17 +58,6 @@ CLASS net/minecraft/unmapped/C_uncfwjlr net/minecraft/client/realms/gui/screen/R ARG 1 server METHOD m_ildtwubj shouldRenewButtonBeActive (Lnet/minecraft/unmapped/C_pwmwypfb;)Z ARG 1 server - METHOD m_ipjllucb drawExpired (Lnet/minecraft/unmapped/C_sedilmty;IIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - METHOD m_josyrogl drawExpiring (Lnet/minecraft/unmapped/C_sedilmty;IIIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 remainingDays METHOD m_lgrkydux pingRegions ()V METHOD m_mzhwlfdb updateButtonStates ()V METHOD m_nykjkgxr onRenew (Lnet/minecraft/unmapped/C_pwmwypfb;)V @@ -82,21 +71,11 @@ CLASS net/minecraft/unmapped/C_uncfwjlr net/minecraft/client/realms/gui/screen/R ARG 2 server METHOD m_qwnzuazr dismissNotification (Ljava/util/UUID;)V ARG 1 notificationUuid - METHOD m_qwpakray drawClose (Lnet/minecraft/unmapped/C_sedilmty;IIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD m_rnkodhsd addNotificationEntries (Lnet/minecraft/unmapped/C_uncfwjlr$C_nwsdpuom;Lnet/minecraft/unmapped/C_auzifczy;)V ARG 1 selectionList ARG 2 notification METHOD m_rtkzebzs setupDataFetcher (Lnet/minecraft/unmapped/C_yyprjalz;)Lnet/minecraft/unmapped/C_tfgqmjhb$C_zolmsrgs; ARG 1 dataFetcher - METHOD m_sswwcikq drawOpen (Lnet/minecraft/unmapped/C_sedilmty;IIII)V - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD m_suxyugra getSelectedServer ()Lnet/minecraft/unmapped/C_pwmwypfb; METHOD m_urzauiuq play (Lnet/minecraft/unmapped/C_pwmwypfb;Lnet/minecraft/unmapped/C_wrmtlwqx;)V ARG 1 serverData diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping index 75e25b13ee..a38656d298 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping @@ -10,5 +10,5 @@ CLASS net/minecraft/unmapped/C_tfdxyltg net/minecraft/client/realms/gui/screen/R ARG 2 parentTitle METHOD m_nbgzhfjb (Lnet/minecraft/unmapped/C_buwziidm;)V ARG 1 button - METHOD m_phzhezch (Lnet/minecraft/unmapped/C_ikfvpkkf;Lnet/minecraft/unmapped/C_oynhlvsg;)V + METHOD m_phzhezch (Lnet/minecraft/unmapped/C_ikfvpkkf;Ljava/lang/Boolean;)V ARG 1 button diff --git a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping index f65e469599..517a4b5dc3 100644 --- a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping +++ b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping @@ -1,7 +1,15 @@ CLASS net/minecraft/unmapped/C_rqhfsngs net/minecraft/client/render/BuiltChunkStorage + FIELD f_afwynqyz viewDistance I FIELD f_gqsafriw worldRenderer Lnet/minecraft/unmapped/C_sfkkabhx; + FIELD f_jiixbeeb xGridSections I + FIELD f_mlshnjmi zGridSections I + FIELD f_ugpffsia yGridSections I FIELD f_ypmjrpkj world Lnet/minecraft/unmapped/C_cdctfzbn; + METHOD (Lnet/minecraft/unmapped/C_sjynkhfr;Lnet/minecraft/unmapped/C_cdctfzbn;ILnet/minecraft/unmapped/C_sfkkabhx;)V + ARG 3 viewDistance METHOD m_flvtwfft clear ()V + METHOD m_lzwczkxc getViewDistance ()I + METHOD m_paxdewur createSections (Lnet/minecraft/unmapped/C_sjynkhfr;)V METHOD m_rxnslrfy updateCameraPosition (DD)V ARG 1 x ARG 3 z @@ -10,5 +18,10 @@ CLASS net/minecraft/unmapped/C_rqhfsngs net/minecraft/client/render/BuiltChunkSt ARG 2 y ARG 3 z ARG 4 important + METHOD m_thmsuaoy getWorld ()Lnet/minecraft/unmapped/C_qpninoyb; METHOD m_uqgbrzua setViewDistance (I)V ARG 1 viewDistance + METHOD m_xexmfpvq index (III)I + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index a19a3c8e3f..c74a269843 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -12,8 +12,17 @@ CLASS net/minecraft/unmapped/C_wosoicga net/minecraft/client/render/model/BakedM ARG 2 colorMap ARG 3 mipmap METHOD close close ()V + METHOD m_aehsgbwe (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;Ljava/lang/Void;)Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx; + ARG 1 state + METHOD m_agtdwviq (Ljava/util/List;)Ljava/util/Map; + ARG 0 _list METHOD m_ecxafngp (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; ARG 1 resources + METHOD m_ektbikha (Lnet/minecraft/unmapped/C_djlixbky;)Ljava/lang/String; + ARG 0 material + METHOD m_elihpnce (Lnet/minecraft/unmapped/C_eslcbfsq;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/unmapped/C_gjnplkfz; + ARG 2 models + ARG 3 blockStates METHOD m_ewpgilcu loadBlockModels (Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 executor METHOD m_fdknnkhy getModel (Lnet/minecraft/unmapped/C_jcudnsmp;)Lnet/minecraft/unmapped/C_nnhmhkbv; @@ -25,6 +34,8 @@ CLASS net/minecraft/unmapped/C_wosoicga net/minecraft/client/render/model/BakedM ARG 1 mipmapLevels METHOD m_jxdqxolx loadBlockStates (Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 executor + METHOD m_lfsclgoe (I)[Ljava/util/concurrent/CompletableFuture; + ARG 0 i METHOD m_lwjqxwnu getMissingModel ()Lnet/minecraft/unmapped/C_nnhmhkbv; METHOD m_mpabbjcv getBlockModels ()Lnet/minecraft/unmapped/C_ovutgaod; METHOD m_mzfbpfdl (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; @@ -32,13 +43,26 @@ CLASS net/minecraft/unmapped/C_wosoicga net/minecraft/client/render/model/BakedM METHOD m_nrawhhyn shouldRerender (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;)Z ARG 1 from ARG 2 to + METHOD m_oppkkipg (Lnet/minecraft/unmapped/C_eslcbfsq;Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;)V + ARG 2 reloadState + METHOD m_palizatf (Ljava/util/List;)Ljava/util/Map; + ARG 0 _list METHOD m_pfipxvmw apply (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;Lnet/minecraft/unmapped/C_eslcbfsq;)V - ARG 1 reloadSTate + ARG 1 reloadState + METHOD m_qzgtnlsp (I)[Ljava/util/concurrent/CompletableFuture; + ARG 0 i + METHOD m_raqoqmgu (Lnet/minecraft/unmapped/C_eslcbfsq;Ljava/util/Map;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx; + ARG 4 reloadState + METHOD m_ruwcwoip (Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_pzkdqusv$C_hddnhiwp; + ARG 0 entry + METHOD m_uozkvopc (Lnet/minecraft/unmapped/C_wosoicga$C_mogtdkcx;)Ljava/util/concurrent/CompletionStage; + ARG 0 reloadState METHOD m_vfuorvoi (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Collection;)V ARG 0 modelId - ARG 1 textures + ARG 1 materials METHOD m_xvhnauan (Ljava/util/Map;Lcom/google/common/collect/Multimap;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_djlixbky;)Lnet/minecraft/unmapped/C_uflrwbwt; ARG 2 modelId + ARG 3 material METHOD m_xzgzhjbz getAtlas (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_qwirmgcf; ARG 1 id CLASS C_mogtdkcx ReloadState diff --git a/mappings/net/minecraft/client/render/model/ModelLoader.mapping b/mappings/net/minecraft/client/render/model/ModelLoader.mapping index c21d26cd67..83131715fd 100644 --- a/mappings/net/minecraft/client/render/model/ModelLoader.mapping +++ b/mappings/net/minecraft/client/render/model/ModelLoader.mapping @@ -46,6 +46,7 @@ CLASS net/minecraft/unmapped/C_gjnplkfz net/minecraft/client/render/model/ModelL ARG 3 modelResources ARG 4 blockStateResources METHOD m_bcuamafh (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ezfeikaq;)V + ARG 1 id ARG 2 stateManager METHOD m_cfqidkii (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map @@ -129,6 +130,9 @@ CLASS net/minecraft/unmapped/C_gjnplkfz net/minecraft/client/render/model/ModelL FIELD f_cjvdgfpd spriteGetter Ljava/util/function/Function; METHOD (Lnet/minecraft/unmapped/C_gjnplkfz;Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 2 spriteGenerator + ARG 3 id + METHOD m_rlqcwykb (Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_djlixbky;)Lnet/minecraft/unmapped/C_uflrwbwt; + ARG 2 material CLASS C_uyeglnzd ModelLoaderException METHOD (Ljava/lang/String;)V ARG 1 message diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index 67ab6f2ad7..cc4295b4c6 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -22,8 +22,6 @@ CLASS net/minecraft/unmapped/C_pyciilvf net/minecraft/client/texture/PlayerSkinP METHOD m_nmwxeldp registerTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/unmapped/C_pyciilvf$C_ekhyenqt;)Ljava/util/concurrent/CompletableFuture; ARG 1 gameProfile ARG 2 textureInfo - METHOD m_oolqbfwk hasSecureTextureData (Lcom/mojang/authlib/GameProfile;)Z - ARG 1 gameProfile CLASS C_ekhyenqt TextureInfo FIELD f_kjtqmzdt EMPTY Lnet/minecraft/unmapped/C_pyciilvf$C_ekhyenqt; METHOD m_qtdamgyh fromMap (Ljava/util/Map;Z)Lnet/minecraft/unmapped/C_pyciilvf$C_ekhyenqt; diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index ecb8bbc0e4..9453496ffa 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/unmapped/C_cwfizcnb net/minecraft/client/util/Session METHOD m_jcifpppv getUsername ()Ljava/lang/String; METHOD m_lvkroujl getAccountType ()Lnet/minecraft/unmapped/C_cwfizcnb$C_pddhjuaa; METHOD m_ojzvtpwl getSessionId ()Ljava/lang/String; - METHOD m_rvpvbauz getProfile ()Lcom/mojang/authlib/GameProfile; METHOD m_wwilqbrq getXuid ()Ljava/util/Optional; METHOD m_yicdupie getAccessToken ()Ljava/lang/String; METHOD m_zweqtmwn getPlayerUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/command/FloatRangeArgument.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping index 72d09345c2..bc5564e6e9 100644 --- a/mappings/net/minecraft/command/FloatRangeArgument.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/unmapped/C_xwkeqzjc net/minecraft/command/FloatRangeArgument ARG 1 value METHOD m_dxuksuzr exactly (F)Lnet/minecraft/unmapped/C_xwkeqzjc; ARG 0 value - METHOD m_fjkmmtfs getMin ()Ljava/lang/Float; METHOD m_fyhjebkw (Ljava/lang/Float;)Ljava/lang/Float; ARG 0 value METHOD m_inzdfmty peekDigit (Lcom/mojang/brigadier/StringReader;Z)Z @@ -41,4 +40,3 @@ CLASS net/minecraft/unmapped/C_xwkeqzjc net/minecraft/command/FloatRangeArgument ARG 1 max METHOD m_vvakrlrx atLeast (F)Lnet/minecraft/unmapped/C_xwkeqzjc; ARG 0 value - METHOD m_xkukbtss getMax ()Ljava/lang/Float; diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping index e88b027182..645ccb4789 100644 --- a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/unmapped/C_fbgfoxlq net/minecraft/command/argument/MessageAr ARG 0 context ARG 1 name ARG 2 callback - METHOD m_ijhyjoqu (Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_zzdolisx;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 3 executor METHOD m_ikdyeswe resolveSignedMessage (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_zzdolisx;)V ARG 0 callback ARG 1 source diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index bb259a9db3..2e2595bf12 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/unmapped/C_nyiqvxcn net/minecraft/data/DataProvider FIELD f_opmypmak LOGGER Lorg/slf4j/Logger; FIELD f_rftlymvj JSON_KEY_SORTER Ljava/util/Comparator; METHOD m_fafjrzdp getName ()Ljava/lang/String; - METHOD m_fnyohrbm writeAsync (Lnet/minecraft/unmapped/C_temnquoh;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; - ARG 0 writer - ARG 1 element - ARG 2 path METHOD m_gpszpvej run (Lnet/minecraft/unmapped/C_temnquoh;)Ljava/util/concurrent/CompletableFuture; ARG 1 writer METHOD m_pgghgory (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index cc7880a73a..ca4179f546 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -240,8 +240,6 @@ CLASS net/minecraft/unmapped/C_hwlnmobw net/minecraft/data/server/RecipesProvide ARG 0 exporter ARG 1 output ARG 2 input - METHOD m_pljsqnwv conditionsFromItemPredicates ([Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_wqesddch$C_bvmbsujf; - ARG 0 items METHOD m_ptqfrnhm createFenceGateRecipe (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_tcpsydrv;)Lnet/minecraft/unmapped/C_ybcoihxg; ARG 0 output ARG 1 input diff --git a/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping index 8297f6b078..1e0c3186bd 100644 --- a/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdventureAdvancementTabGenerator.mapping @@ -3,9 +3,8 @@ CLASS net/minecraft/unmapped/C_unbelsbg net/minecraft/data/server/advancement/Ad METHOD m_fdomsedq usingItemAndLookingAtEntityCondition (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_jtrqmgsq$C_nenbghty; ARG 0 type ARG 1 item - METHOD m_kpzuqmoa lightningStruckWithingRange (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_ujdwetcx$C_nyevovia; + METHOD m_kpzuqmoa lightningStruckWithingRange (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_ujdwetcx$C_nyevovia; ARG 0 range - ARG 1 predicate 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 diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 64baa35dcc..e43d0c8d45 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -88,8 +88,6 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType ARG 0 previous ARG 3 player METHOD m_ncqhbjml getHeight ()F - METHOD m_njeyrjbp isIn (Lnet/minecraft/unmapped/C_ednuhnnn;)Z - ARG 1 key METHOD m_nmpsuzom (Lnet/minecraft/unmapped/C_astfners;)V ARG 0 entity METHOD m_nshhmmgl get (Ljava/lang/String;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 929b965177..23b49f0fe8 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -41,8 +41,6 @@ CLASS net/minecraft/unmapped/C_hdbqsqsm net/minecraft/entity/attribute/EntityAtt COMMENT Multiplies the total value of the attribute. COMMENT COMMENT

The total value is equal to the sum of all additions and base multiplications applied by an attribute modifier. - METHOD (Ljava/lang/String;II)V - ARG 3 id METHOD m_qcppmtzl fromId (I)Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs; ARG 0 id METHOD m_yvxnixtw getId ()I diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 89bd3bbd74..a7293c71f1 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -19,18 +19,12 @@ CLASS net/minecraft/unmapped/C_jaqasomh net/minecraft/entity/effect/StatusEffect METHOD m_glzjklmf setFactorDataFactory (Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_jaqasomh; ARG 1 factorDataFactory METHOD m_igvnkdng isBeneficial ()Z - METHOD m_ivbyddit getEffectRawId (Lnet/minecraft/unmapped/C_jaqasomh;)I - ARG 0 effect - METHOD m_jzogqyhc byRawId (I)Lnet/minecraft/unmapped/C_jaqasomh; - ARG 0 rawId METHOD m_mhpaprgc getAttributeModifiers ()Ljava/util/Map; METHOD m_nnnovhef addAttributeModifier (Lnet/minecraft/unmapped/C_ppzfbbsy;Ljava/lang/String;DLnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Lnet/minecraft/unmapped/C_jaqasomh; ARG 1 attribute ARG 2 uuid ARG 3 amount ARG 5 operation - METHOD m_oaxjffkn getRawId (Lnet/minecraft/unmapped/C_jaqasomh;)I - ARG 0 type METHOD m_qpdmsuqi getType ()Lnet/minecraft/unmapped/C_mbktilxo; METHOD m_sdyrfndd loadTranslationKey ()Ljava/lang/String; METHOD m_sfpvrsws onRemoved (Lnet/minecraft/unmapped/C_cohbwqne;)V diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index 2bf2af6ae0..3122c1680a 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/unmapped/C_srfncnhx net/minecraft/entity/effect/StatusEffects FIELD f_htvhwvfu DARKNESS_PADDING_DURATION I - METHOD m_jkusimtl register (ILjava/lang/String;Lnet/minecraft/unmapped/C_jaqasomh;)Lnet/minecraft/unmapped/C_jaqasomh; - ARG 0 rawId - ARG 1 id - ARG 2 entry + METHOD m_jkusimtl register (Ljava/lang/String;Lnet/minecraft/unmapped/C_jaqasomh;)Lnet/minecraft/unmapped/C_jaqasomh; + ARG 0 id + ARG 1 entry diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index de5894a5af..23c2dfa3f4 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -2,14 +2,10 @@ CLASS net/minecraft/unmapped/C_keggniig net/minecraft/entity/passive/MooshroomEn FIELD f_awrewgcz TYPE Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_azeqsebv lightningId Ljava/util/UUID; FIELD f_exospqbd MUTATION_CHANCE I - FIELD f_ufujqwnl stewEffect Lnet/minecraft/unmapped/C_jaqasomh; - FIELD f_wrpsnyoy stewEffectDuration I METHOD m_jzpqucun chooseBabyType (Lnet/minecraft/unmapped/C_keggniig;)Lnet/minecraft/unmapped/C_keggniig$C_awkufnzt; ARG 1 mooshroom METHOD m_kxtqrrwl (Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jzrpycqo;)V ARG 1 player - METHOD m_oswqsudn getStewEffectFrom (Lnet/minecraft/unmapped/C_sddaxwyk;)Ljava/util/Optional; - ARG 1 flower METHOD m_rbekgcxf canSpawn (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_uzzvxofv;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/item/SuspiciousStewEffectContainer.mapping b/mappings/net/minecraft/item/SuspiciousStewEffectContainer.mapping index 68c81be7eb..54774899a6 100644 --- a/mappings/net/minecraft/item/SuspiciousStewEffectContainer.mapping +++ b/mappings/net/minecraft/item/SuspiciousStewEffectContainer.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/unmapped/C_noldxssx net/minecraft/item/SuspiciousStewEffectContainer METHOD m_gaivnnnr getAll ()Ljava/util/List; - METHOD m_isaclast getStewEffectDuration ()I - METHOD m_jcjkuhnt getStewEffect ()Lnet/minecraft/unmapped/C_jaqasomh; METHOD m_zuxvbyei getContainerOrNull (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_noldxssx; ARG 0 item diff --git a/mappings/net/minecraft/item/SuspiciousStewItem.mapping b/mappings/net/minecraft/item/SuspiciousStewItem.mapping index 05e081e620..c27af78fbd 100644 --- a/mappings/net/minecraft/item/SuspiciousStewItem.mapping +++ b/mappings/net/minecraft/item/SuspiciousStewItem.mapping @@ -1,13 +1,7 @@ CLASS net/minecraft/unmapped/C_kkuffgzc net/minecraft/item/SuspiciousStewItem FIELD f_dnpbdfae DEFAULT_EFFECT_DURATION I - FIELD f_lrwjllbv EFFECT_ID_KEY Ljava/lang/String; - FIELD f_ssywxyld EFFECT_DURATION_KEY Ljava/lang/String; FIELD f_wopcliea EFFECTS_KEY Ljava/lang/String; METHOD m_cryeecjp consumeStatusEffects (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Consumer;)V ARG 0 stack ARG 1 consumer COMMENT handles the usage of each new status effect instance after it is created - METHOD m_uzgatjkk addEffectToStew (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jaqasomh;I)V - ARG 0 stew - ARG 1 effect - ARG 2 duration diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 29ed1bee92..a807abfc57 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -12,25 +12,13 @@ CLASS net/minecraft/unmapped/C_lptbbwvu net/minecraft/item/map/MapIcon ARG 5 text METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD m_blnyvojo getZ ()B - METHOD m_hmrdkqnn getX ()B - METHOD m_nrmnbdxe getRotation ()B METHOD m_wpmipjmn getTypeId ()B - METHOD m_ymcyvaim getType ()Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee; - METHOD m_zfkzzaod getText ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_zjovkzkg isAlwaysRendered ()Z CLASS C_ooswjmee Type FIELD f_hckokdxw tintColor I FIELD f_kqdssutz trackCount Z FIELD f_lqhzwwnk alwaysRender Z FIELD f_tzdiknso id B - METHOD (Ljava/lang/String;IZIZ)V - ARG 3 alwaysRender - ARG 4 tintColor - ARG 5 trackCount - METHOD (Ljava/lang/String;IZZ)V - ARG 3 alwaysRender - ARG 4 trackCount METHOD m_aivrrufe shouldTrackCount ()Z METHOD m_bkxqwhsz isAlwaysRendered ()Z METHOD m_cefcwcvf getTintColor ()I diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping index c2269cd6da..133919ccd6 100644 --- a/mappings/net/minecraft/loot/LootDataType.mapping +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -1,47 +1,17 @@ CLASS net/minecraft/unmapped/C_gvzqwcwq net/minecraft/loot/LootDataType FIELD f_iricqgse dataType Ljava/lang/String; - FIELD f_uamowmnv deserializer Ljava/util/function/BiFunction; - FIELD f_vwsaprov gson Lcom/google/gson/Gson; FIELD f_zybjkfjt validator Lnet/minecraft/unmapped/C_gvzqwcwq$C_ntpbpvku; - METHOD (Lcom/google/gson/Gson;Ljava/util/function/BiFunction;Ljava/lang/String;Lnet/minecraft/unmapped/C_gvzqwcwq$C_ntpbpvku;)V - ARG 1 gson - ARG 2 deserializerFactory - ARG 3 dataType - ARG 4 validator METHOD m_bgciklpf createLootTableValidator ()Lnet/minecraft/unmapped/C_gvzqwcwq$C_ntpbpvku; METHOD m_eenuqtkp stream ()Ljava/util/stream/Stream; - METHOD m_gcleqsnj (Lcom/google/gson/Gson;Ljava/lang/Class;Ljava/lang/String;Lnet/minecraft/unmapped/C_ncpywfca;Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 3 id - ARG 4 json - METHOD m_gxuqwdll (Ljava/lang/Class;Lcom/google/gson/Gson;Ljava/lang/String;)Ljava/util/function/BiFunction; - ARG 1 gson - ARG 2 dataType - METHOD m_kbclhbul createDeserializer (Ljava/lang/Class;Ljava/util/function/Function;)Ljava/util/function/BiFunction; - ARG 0 modelClass - ARG 1 merger - METHOD m_kpsaruwl (Ljava/lang/Class;Ljava/util/function/Function;Ljava/lang/Class;Lcom/google/gson/Gson;Ljava/lang/String;)Ljava/util/function/BiFunction; - ARG 0 gson - ARG 1 dataType - METHOD m_nwtjmabp getGson ()Lcom/google/gson/Gson; - METHOD m_owhcppaf createSingleDeserializer (Ljava/lang/Class;)Ljava/util/function/BiFunction; - ARG 0 modelClass METHOD m_uoteoqos deserialize (Lnet/minecraft/unmapped/C_ncpywfca;Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 1 id ARG 2 json - METHOD m_uziuslgy (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_dxrjneaa;Lnet/minecraft/unmapped/C_inwsuliy;)V - ARG 0 reporter - ARG 1 key - ARG 2 element METHOD m_voorxgef getDataType ()Ljava/lang/String; METHOD m_xqndkipm createSimpleValidator ()Lnet/minecraft/unmapped/C_gvzqwcwq$C_ntpbpvku; METHOD m_xyebpstg validate (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_dxrjneaa;Ljava/lang/Object;)V ARG 1 reporter ARG 2 key ARG 3 element - METHOD m_yzjhwoph (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_dxrjneaa;Lnet/minecraft/unmapped/C_dogcxkxz;)V - ARG 0 reporter - ARG 1 key - ARG 2 element CLASS C_ntpbpvku Validator METHOD run run (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_dxrjneaa;Ljava/lang/Object;)V ARG 1 reporter diff --git a/mappings/net/minecraft/loot/LootGsons.mapping b/mappings/net/minecraft/loot/LootGsons.mapping deleted file mode 100644 index 9e9412f82a..0000000000 --- a/mappings/net/minecraft/loot/LootGsons.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/unmapped/C_jlaaqska net/minecraft/loot/LootGsons - METHOD m_fqjhgxcm getFunctionGsonBuilder ()Lcom/google/gson/GsonBuilder; - METHOD m_pzrgijvf getTableGsonBuilder ()Lcom/google/gson/GsonBuilder; - METHOD m_wcsnvpis getConditionGsonBuilder ()Lcom/google/gson/GsonBuilder; diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index 94f6fb555d..d9faba1195 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -11,10 +11,6 @@ CLASS net/minecraft/unmapped/C_uxsnhxlb net/minecraft/loot/LootManager ARG 0 reporter ARG 1 key ARG 2 element - METHOD m_gfnefxwn createFunctionSequence ([Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 0 functions - METHOD m_iwuikabk and ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_vqkczpuv; - ARG 0 conditions METHOD m_ljiqrdbn (Lnet/minecraft/unmapped/C_gvzqwcwq;Ljava/util/Map;Lnet/minecraft/unmapped/C_ncpywfca;Lcom/google/gson/JsonElement;)V ARG 2 id ARG 3 json @@ -34,18 +30,3 @@ CLASS net/minecraft/unmapped/C_uxsnhxlb net/minecraft/loot/LootManager ARG 0 dataType ARG 2 prepareExecutor ARG 3 allElements - CLASS C_blhzzkjv AndCondition - FIELD f_aaqhpszy predicate Ljava/util/function/Predicate; - FIELD f_lxolvhcb terms [Lnet/minecraft/unmapped/C_vqkczpuv; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;)V - ARG 1 terms - METHOD test (Ljava/lang/Object;)Z - ARG 1 context - CLASS C_dicbfhys FunctionSequence - FIELD f_mnqhxkeh functions [Lnet/minecraft/unmapped/C_tmxhskql; - FIELD f_pwidyvuz composite Ljava/util/function/BiFunction; - METHOD ([Lnet/minecraft/unmapped/C_tmxhskql;)V - ARG 1 functions - METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 stack - ARG 2 context diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index 8a79bfa691..b50996a9a3 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -1,22 +1,14 @@ CLASS net/minecraft/unmapped/C_yaprhqrh net/minecraft/loot/LootPool FIELD f_acstrxwp bonusRolls Lnet/minecraft/unmapped/C_iajmfyig; - FIELD f_bbudefps entries [Lnet/minecraft/unmapped/C_rhqekity; + FIELD f_bbudefps entries Ljava/util/List; FIELD f_ddojmgpb rolls Lnet/minecraft/unmapped/C_iajmfyig; FIELD f_ehfmjapd javaFunctions Ljava/util/function/BiFunction; - FIELD f_nmogiheq conditions [Lnet/minecraft/unmapped/C_vqkczpuv; + FIELD f_nmogiheq conditions Ljava/util/List; FIELD f_rnkwguda predicate Ljava/util/function/Predicate; - FIELD f_ylrsjjzy functions [Lnet/minecraft/unmapped/C_tmxhskql; - METHOD ([Lnet/minecraft/unmapped/C_rhqekity;[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iajmfyig;)V - ARG 1 entries - ARG 2 conditions - ARG 3 functions - ARG 4 rolls - ARG 5 bonusRolls + FIELD f_ylrsjjzy functions Ljava/util/List; METHOD m_gvwmxvoz addGeneratedLoot (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_iakykpgh;)V ARG 1 lootConsumer ARG 2 context - METHOD m_oywfwihw (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/List;Lorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/unmapped/C_iozoltsq;)V - ARG 3 choice METHOD m_ozbdjpls supplyOnce (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_iakykpgh;)V ARG 1 lootConsumer ARG 2 context @@ -24,11 +16,11 @@ CLASS net/minecraft/unmapped/C_yaprhqrh net/minecraft/loot/LootPool ARG 1 reporter METHOD m_zrmyzjen builder ()Lnet/minecraft/unmapped/C_yaprhqrh$C_rxnatgym; CLASS C_rxnatgym Builder - FIELD f_bxkgoisg entries Ljava/util/List; - FIELD f_kcezakjn functions Ljava/util/List; + FIELD f_bxkgoisg entries Lcom/google/common/collect/ImmutableList$Builder; + FIELD f_kcezakjn functions Lcom/google/common/collect/ImmutableList$Builder; FIELD f_oarovnam bonusRollsRange Lnet/minecraft/unmapped/C_iajmfyig; FIELD f_stwmarkp rolls Lnet/minecraft/unmapped/C_iajmfyig; - FIELD f_wgukpgrq conditions Ljava/util/List; + FIELD f_wgukpgrq conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD m_dzjhyufs rolls (Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_yaprhqrh$C_rxnatgym; ARG 1 rolls METHOD m_ngriifhs with (Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_yaprhqrh$C_rxnatgym; @@ -36,12 +28,3 @@ CLASS net/minecraft/unmapped/C_yaprhqrh net/minecraft/loot/LootPool METHOD m_resfahuq bonusRolls (Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_yaprhqrh$C_rxnatgym; ARG 1 bonusRolls METHOD m_rggujtkf build ()Lnet/minecraft/unmapped/C_yaprhqrh; - CLASS C_ubodtofb Serializer - METHOD deserialize deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 21aa7e5529..7deacaefeb 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,17 +1,12 @@ CLASS net/minecraft/unmapped/C_inwsuliy net/minecraft/loot/LootTable FIELD f_dyzbynxg type Lnet/minecraft/unmapped/C_vczsvjil; FIELD f_euzdblpq combinedFunction Ljava/util/function/BiFunction; - FIELD f_fuzuxxka functions [Lnet/minecraft/unmapped/C_tmxhskql; - FIELD f_laaskmuo randomSequenceId Lnet/minecraft/unmapped/C_ncpywfca; - FIELD f_nawobxkn pools [Lnet/minecraft/unmapped/C_yaprhqrh; + FIELD f_fuzuxxka functions Ljava/util/List; + FIELD f_laaskmuo randomSequenceId Ljava/util/Optional; + FIELD f_nawobxkn pools Ljava/util/List; FIELD f_ookilagu GENERIC Lnet/minecraft/unmapped/C_vczsvjil; FIELD f_rgkwwxmf LOGGER Lorg/slf4j/Logger; FIELD f_sartmpeq EMPTY Lnet/minecraft/unmapped/C_inwsuliy; - METHOD (Lnet/minecraft/unmapped/C_vczsvjil;Lnet/minecraft/unmapped/C_ncpywfca;[Lnet/minecraft/unmapped/C_yaprhqrh;[Lnet/minecraft/unmapped/C_tmxhskql;)V - ARG 1 type - ARG 2 randomSequenceId - ARG 3 pools - ARG 4 functions METHOD m_azuvczrx generateRawLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;JLjava/util/function/Consumer;)V ARG 1 parameterSet ARG 2 seed @@ -31,8 +26,6 @@ CLASS net/minecraft/unmapped/C_inwsuliy net/minecraft/loot/LootTable METHOD m_henqulth generateLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;Ljava/util/function/Consumer;)V ARG 1 parameterSet ARG 2 lootConsumer - METHOD m_ipoqnmfc (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_sddaxwyk;)V - ARG 2 stack METHOD m_kdnetbvp generateLoot (Lnet/minecraft/unmapped/C_nzsnkdtl;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; ARG 1 parameterSet METHOD m_ksxvxexm generateRawLoot (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)V @@ -54,20 +47,11 @@ CLASS net/minecraft/unmapped/C_inwsuliy net/minecraft/loot/LootTable METHOD m_tmeopeok builder ()Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; METHOD m_xfbhesuf processStacks (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Consumer;)Ljava/util/function/Consumer; ARG 1 lootConsumer - CLASS C_ckjgeyvf Serializer - METHOD deserialize deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 supplier - ARG 2 unused - ARG 3 context CLASS C_daaljsfu Builder FIELD f_azlxvnwl type Lnet/minecraft/unmapped/C_vczsvjil; - FIELD f_dnxcxqti pools Ljava/util/List; - FIELD f_ijfxhrub functions Ljava/util/List; - FIELD f_otnnxqlc randomSequenceId Lnet/minecraft/unmapped/C_ncpywfca; + FIELD f_dnxcxqti pools Lcom/google/common/collect/ImmutableList$Builder; + FIELD f_ijfxhrub functions Lcom/google/common/collect/ImmutableList$Builder; + FIELD f_otnnxqlc randomSequenceId Ljava/util/Optional; METHOD m_aobmfqnj build ()Lnet/minecraft/unmapped/C_inwsuliy; METHOD m_fbpeyqpg pool (Lnet/minecraft/unmapped/C_yaprhqrh$C_rxnatgym;)Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu; ARG 1 poolBuilder diff --git a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping index 4f98b85fb0..28106507dd 100644 --- a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping @@ -1,7 +1,2 @@ CLASS net/minecraft/unmapped/C_ramegrrx net/minecraft/loot/condition/AllOfLootCondition - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;)V - ARG 1 conditions - METHOD m_cmtfungf create ([Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_ramegrrx$C_tbmltwqb; - ARG 0 builders - CLASS C_sokxfpve Serializer CLASS C_tbmltwqb Builder diff --git a/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping index 57bd2fc071..e3c9b55483 100644 --- a/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/unmapped/C_nmcwjjew net/minecraft/loot/condition/AnyOfLootCondition - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;)V - ARG 1 conditons 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 - CLASS C_ubxkcydi Serializer diff --git a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping index 752808e927..c385cc2909 100644 --- a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping @@ -1,20 +1,14 @@ CLASS net/minecraft/unmapped/C_kwfsxfym net/minecraft/loot/condition/BlockStatePropertyLootCondition - FIELD f_aurmymjq properties Lnet/minecraft/unmapped/C_fsjpkzrx; - FIELD f_mektqjvw block Lnet/minecraft/unmapped/C_mmxmpdoq; - METHOD (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_fsjpkzrx;)V - ARG 1 block - ARG 2 properties + FIELD f_aurmymjq properties Ljava/util/Optional; + FIELD f_mektqjvw block Lnet/minecraft/unmapped/C_cjzoxshv; METHOD m_qlrdhwtv builder (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_kwfsxfym$C_endolkru; ARG 0 block METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS C_endolkru Builder - FIELD f_dtwmnvzs block Lnet/minecraft/unmapped/C_mmxmpdoq; - FIELD f_jwdfgoxp propertyValues Lnet/minecraft/unmapped/C_fsjpkzrx; + FIELD f_dtwmnvzs block Lnet/minecraft/unmapped/C_cjzoxshv; + FIELD f_jwdfgoxp propertyValues Ljava/util/Optional; METHOD (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block METHOD m_vukyuqtz properties (Lnet/minecraft/unmapped/C_fsjpkzrx$C_wpxfzjkz;)Lnet/minecraft/unmapped/C_kwfsxfym$C_endolkru; ARG 1 builder - CLASS C_gbrtzpci Serializer - METHOD m_dgwzmnwp (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/lang/String;)V - ARG 1 propertyName diff --git a/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping b/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping index b5271ab919..fc276399d1 100644 --- a/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/CompoundLootCondition.mapping @@ -1,21 +1,12 @@ CLASS net/minecraft/unmapped/C_ctyjhvds net/minecraft/loot/condition/CompoundLootCondition FIELD f_hhdzxlyp predicate Ljava/util/function/Predicate; - FIELD f_vsuaiinl conditions [Lnet/minecraft/unmapped/C_vqkczpuv; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Ljava/util/function/Predicate;)V - ARG 1 conditions - ARG 2 predicate + FIELD f_vsuaiinl conditions Ljava/util/List; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_lmzmzequ Serializer - METHOD m_tregdvdt create ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_ctyjhvds; - ARG 1 conditions CLASS C_oldlxhyu Builder - FIELD f_enkonabg builders Ljava/util/List; + FIELD f_enkonabg builders Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)V ARG 1 builders - METHOD m_iehlqyrw (I)[Lnet/minecraft/unmapped/C_vqkczpuv; - ARG 0 i METHOD m_liolcgkn add (Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)V ARG 1 builder - METHOD m_rokhhcul build ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_vqkczpuv; - ARG 1 conditions + METHOD m_rokhhcul build (Ljava/util/List;)Lnet/minecraft/unmapped/C_vqkczpuv; diff --git a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping index d82a7c375f..0f3ee93d98 100644 --- a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/unmapped/C_qajfsodc net/minecraft/loot/condition/DamageSourcePropertiesLootCondition - FIELD f_jtkuuwnb predicate Lnet/minecraft/unmapped/C_pbkrjvwn; - METHOD (Lnet/minecraft/unmapped/C_pbkrjvwn;)V - ARG 1 predicate + FIELD f_jtkuuwnb predicate Ljava/util/Optional; METHOD m_zdywrwwq builder (Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; ARG 0 builder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_eiegmaze Serializer diff --git a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping index e7b9fde790..68736ab27f 100644 --- a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/unmapped/C_kkszwind net/minecraft/loot/condition/EntityPropertiesLootCondition FIELD f_lcxsdenc entity Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh; - FIELD f_sqicwjpz predicate Lnet/minecraft/unmapped/C_kvkvpjlm; - METHOD (Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)V - ARG 1 predicate - ARG 2 entity + FIELD f_sqicwjpz predicate Ljava/util/Optional; METHOD m_chrdjoco create (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; ARG 0 entity METHOD m_ikmptnrn builder (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; @@ -14,4 +11,3 @@ CLASS net/minecraft/unmapped/C_kkszwind net/minecraft/loot/condition/EntityPrope ARG 1 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_ryafwtrc Serializer diff --git a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping index 348e86d41b..d1cb5b9540 100644 --- a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping @@ -14,10 +14,9 @@ CLASS net/minecraft/unmapped/C_alodcxmm net/minecraft/loot/condition/EntityScore ARG 0 target METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_cyeuckxn Serializer CLASS C_fxksbbfp Builder FIELD f_tkxocccw target Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh; - FIELD f_xkjpnegm scores Ljava/util/Map; + FIELD f_xkjpnegm scores Lcom/google/common/collect/ImmutableMap$Builder; METHOD (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)V ARG 1 target METHOD m_uvibmsim score (Ljava/lang/String;Lnet/minecraft/unmapped/C_rcavspxn;)Lnet/minecraft/unmapped/C_alodcxmm$C_fxksbbfp; diff --git a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping index da52f114a0..32e71e1b49 100644 --- a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping @@ -6,4 +6,3 @@ CLASS net/minecraft/unmapped/C_falmkwpq net/minecraft/loot/condition/InvertedLoo ARG 0 term METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_wgqwykvy Serializer diff --git a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping index b09e44ad46..3c36142bd2 100644 --- a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/unmapped/C_wazobvww net/minecraft/loot/condition/KilledByPla METHOD m_ncjzqrbq builder ()Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_wygyyrgs Serializer diff --git a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping index b5fc8d05ab..e0b5470576 100644 --- a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/unmapped/C_lqmakrms net/minecraft/loot/condition/LocationCheckLootCondition FIELD f_bfijysui offset Lnet/minecraft/unmapped/C_hynzadkk; - FIELD f_eqnfjjsw predicate Lnet/minecraft/unmapped/C_ypvebgnl; - METHOD (Lnet/minecraft/unmapped/C_ypvebgnl;Lnet/minecraft/unmapped/C_hynzadkk;)V - ARG 1 predicate - ARG 2 offset + FIELD f_eqnfjjsw predicate Ljava/util/Optional; METHOD m_epauhchv builder (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; ARG 0 predicateBuilder ARG 1 pos @@ -11,4 +8,3 @@ CLASS net/minecraft/unmapped/C_lqmakrms net/minecraft/loot/condition/LocationChe ARG 0 predicateBuilder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_maskikgn Serializer diff --git a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping index 3a3708e8fa..1257b2a544 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping @@ -1,17 +1,9 @@ CLASS net/minecraft/unmapped/C_ijynualg net/minecraft/loot/condition/LootConditionTypes - METHOD m_bxfjipfr joinAnd ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; - ARG 0 predicates - METHOD m_hfawsflu joinOr ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; - ARG 0 predicates - METHOD m_kmrftxnf ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z - ARG 1 operand - METHOD m_ojibhimd createGsonSerializer ()Ljava/lang/Object; - METHOD m_osmoobxn ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z - ARG 1 operand - METHOD m_pwffgfiz register (Ljava/lang/String;Lnet/minecraft/unmapped/C_qdtgrmkp;)Lnet/minecraft/unmapped/C_debunopu; + METHOD m_bxfjipfr joinAnd (Ljava/util/List;)Ljava/util/function/Predicate; + METHOD m_hfawsflu joinOr (Ljava/util/List;)Ljava/util/function/Predicate; + METHOD m_kmrftxnf (Ljava/lang/Object;)Z + ARG 0 operand + METHOD m_osmoobxn (Ljava/lang/Object;)Z + ARG 0 operand + METHOD m_pwffgfiz register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_debunopu; ARG 0 id - ARG 1 serializer - METHOD m_szcwbchk (Ljava/lang/Object;)Z - ARG 0 predicates - METHOD m_zkiqjoor (Ljava/lang/Object;)Z - ARG 0 predicates diff --git a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping index 3a5fac4937..7a1123bd12 100644 --- a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/unmapped/C_rzufcffg net/minecraft/loot/condition/MatchToolLootCondition - FIELD f_skczxkoz predicate Lnet/minecraft/unmapped/C_afravpde; - METHOD (Lnet/minecraft/unmapped/C_afravpde;)V - ARG 1 predicate + FIELD f_skczxkoz predicate Ljava/util/Optional; METHOD m_wkjlzidw builder (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; ARG 0 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_nwomlvch Serializer diff --git a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping index 6ebb3529fb..877c20d7a5 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping @@ -6,4 +6,3 @@ CLASS net/minecraft/unmapped/C_vvwlqdtn net/minecraft/loot/condition/RandomChanc ARG 0 chance METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_fmyydpxt Serializer diff --git a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping index 0accd91e0b..93648dbeaa 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping @@ -9,4 +9,3 @@ CLASS net/minecraft/unmapped/C_jmmvunzx net/minecraft/loot/condition/RandomChanc ARG 1 lootingMultiplier METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_puosryws Serializer diff --git a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping index fba564a82a..16058b8369 100644 --- a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping @@ -7,4 +7,3 @@ CLASS net/minecraft/unmapped/C_dtftepex net/minecraft/loot/condition/ReferenceLo ARG 0 id METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_bnfbrjyd Serializer diff --git a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping index b5d5a6dfcf..ce4ec41232 100644 --- a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/unmapped/C_oakzhvku net/minecraft/loot/condition/SurvivesExp METHOD m_igxbgnkx builder ()Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_azoozjvh Serializer diff --git a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping index 9342e06bec..00b56213e3 100644 --- a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/unmapped/C_nttdmald net/minecraft/loot/condition/TableBonusLootCondition - FIELD f_axmfycpo enchantment Lnet/minecraft/unmapped/C_jxtrubuh; - FIELD f_hnquhvdw chances [F - METHOD (Lnet/minecraft/unmapped/C_jxtrubuh;[F)V - ARG 1 enchantment - ARG 2 chances + FIELD f_axmfycpo enchantment Lnet/minecraft/unmapped/C_cjzoxshv; + FIELD f_hnquhvdw chances Ljava/util/List; METHOD m_tmbdegkn builder (Lnet/minecraft/unmapped/C_jxtrubuh;[F)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; ARG 0 enchantment ARG 1 chances METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_posmsusw Serializer diff --git a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping index 60731bfbd8..cee38843e3 100644 --- a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping @@ -1,17 +1,13 @@ CLASS net/minecraft/unmapped/C_kjttmclh net/minecraft/loot/condition/TimeCheckLootCondition - FIELD f_nligahtp period Ljava/lang/Long; + FIELD f_nligahtp period Ljava/util/Optional; FIELD f_ptgdgvms value Lnet/minecraft/unmapped/C_rcavspxn; - METHOD (Ljava/lang/Long;Lnet/minecraft/unmapped/C_rcavspxn;)V - ARG 1 period - ARG 2 value METHOD m_zbmfbhfu create (Lnet/minecraft/unmapped/C_rcavspxn;)Lnet/minecraft/unmapped/C_kjttmclh$C_tdkzceog; ARG 0 value METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_eovjpdgp Serializer CLASS C_tdkzceog Builder FIELD f_gmztujhl value Lnet/minecraft/unmapped/C_rcavspxn; - FIELD f_lymtepwd period Ljava/lang/Long; + FIELD f_lymtepwd period Ljava/util/Optional; METHOD (Lnet/minecraft/unmapped/C_rcavspxn;)V ARG 1 value METHOD m_bkkomffm period (J)Lnet/minecraft/unmapped/C_kjttmclh$C_tdkzceog; diff --git a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping index f9b39edb5e..6b7163d386 100644 --- a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping @@ -9,4 +9,3 @@ CLASS net/minecraft/unmapped/C_tfmwaqli net/minecraft/loot/condition/ValueCheckL ARG 1 range METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS C_ibjomqxy Serializer diff --git a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping index 4521404b3f..2aadfb3e6c 100644 --- a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping @@ -1,17 +1,11 @@ CLASS net/minecraft/unmapped/C_dhxyhsvb net/minecraft/loot/condition/WeatherCheckLootCondition - FIELD f_eiogtseh thundering Ljava/lang/Boolean; - FIELD f_jahgemzk raining Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 raining - ARG 2 thundering + FIELD f_eiogtseh thundering Ljava/util/Optional; + FIELD f_jahgemzk raining Ljava/util/Optional; METHOD m_xdxgaldj create ()Lnet/minecraft/unmapped/C_dhxyhsvb$C_lzumnawe; METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS C_lzumnawe Builder - FIELD f_rwtliqhn raining Ljava/lang/Boolean; - FIELD f_vttkkyau thundering Ljava/lang/Boolean; - METHOD m_fiprqxhl thundering (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_dhxyhsvb$C_lzumnawe; - ARG 1 thundering - METHOD m_nzqrinbu raining (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_dhxyhsvb$C_lzumnawe; - ARG 1 raining - CLASS C_rrwgywrh Serializer + FIELD f_rwtliqhn raining Ljava/util/Optional; + FIELD f_vttkkyau thundering Ljava/util/Optional; + METHOD m_fiprqxhl thundering (Z)Lnet/minecraft/unmapped/C_dhxyhsvb$C_lzumnawe; + METHOD m_nzqrinbu raining (Z)Lnet/minecraft/unmapped/C_dhxyhsvb$C_lzumnawe; diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index 1b4662157a..ae85a5e87a 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -42,19 +42,12 @@ CLASS net/minecraft/unmapped/C_iakykpgh net/minecraft/loot/context/LootContext METHOD m_lzewnxma getParameter ()Lnet/minecraft/unmapped/C_xsaigefq; METHOD m_quasqlsc fromString (Ljava/lang/String;)Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh; ARG 0 type - CLASS C_dmkftaxp Serializer - METHOD read read (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object; - ARG 1 reader - METHOD write write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V - ARG 1 writer - ARG 2 entity CLASS C_xdyltqvb Builder FIELD f_cfeuvpzt parameters Lnet/minecraft/unmapped/C_nzsnkdtl; FIELD f_cphcdszg random Lnet/minecraft/unmapped/C_rlomrsco; METHOD (Lnet/minecraft/unmapped/C_nzsnkdtl;)V ARG 1 parameters - METHOD m_hoabyrky build (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_iakykpgh; - ARG 1 id + METHOD m_hoabyrky build (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_iakykpgh; METHOD m_jiwxjvnm getWorld ()Lnet/minecraft/unmapped/C_bdwnwhiu; METHOD m_lmjmflya withRandomSeed (J)Lnet/minecraft/unmapped/C_iakykpgh$C_xdyltqvb; ARG 1 seed diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index fd3a7d2bb2..0d3465796e 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -6,26 +6,16 @@ CLASS net/minecraft/unmapped/C_oepzwcin net/minecraft/loot/context/LootContextTy ARG 0 builder METHOD m_eyzpjxhi (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V ARG 0 builder - METHOD m_fahscmpk (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V - ARG 0 builder METHOD m_fetivdqx (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V ARG 0 builder METHOD m_fkeqqsyo (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V ARG 0 builder - METHOD m_hmpevqoe get (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_vczsvjil; - ARG 0 id - METHOD m_jxhmrznc (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V - ARG 0 builder METHOD m_lopibqkx (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V ARG 0 builder METHOD m_sjrwsktd (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V ARG 0 builder METHOD m_skfffkyk (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V ARG 0 builder - METHOD m_thjyxwce getId (Lnet/minecraft/unmapped/C_vczsvjil;)Lnet/minecraft/unmapped/C_ncpywfca; - ARG 0 type - METHOD m_tiirdtcu (Lnet/minecraft/unmapped/C_vczsvjil$C_nqewaukk;)V - ARG 0 builder METHOD m_vyxqvrqd register (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_vczsvjil; ARG 0 name ARG 1 type diff --git a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping index 83db770eb6..5800b6cadb 100644 --- a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping +++ b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping @@ -4,10 +4,10 @@ CLASS net/minecraft/unmapped/C_bxdjuaxc net/minecraft/loot/entry/AlternativeEntr ARG 1 toBuilderFunction METHOD m_qkirgjcc builder ([Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_bxdjuaxc$C_clxkdaqf; ARG 0 children - METHOD m_rmvbrvud ([Lnet/minecraft/unmapped/C_pseivtsw;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)Z + METHOD m_rmvbrvud (Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander CLASS C_clxkdaqf Builder - FIELD f_opidcbus children Ljava/util/List; + FIELD f_opidcbus children Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)V ARG 1 children diff --git a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping index 565cba2ea4..7f02ef69ed 100644 --- a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -1,14 +1,5 @@ CLASS net/minecraft/unmapped/C_ltwxwtjr net/minecraft/loot/entry/CombinedEntry FIELD f_fptvnuja predicate Lnet/minecraft/unmapped/C_pseivtsw; - FIELD f_ouzzcuuw children [Lnet/minecraft/unmapped/C_rhqekity; - METHOD ([Lnet/minecraft/unmapped/C_rhqekity;[Lnet/minecraft/unmapped/C_vqkczpuv;)V - ARG 1 children - ARG 2 conditions - METHOD m_suvxbgwp combine ([Lnet/minecraft/unmapped/C_pseivtsw;)Lnet/minecraft/unmapped/C_pseivtsw; - ARG 1 children - METHOD m_uzahbwye createSerializer (Lnet/minecraft/unmapped/C_ltwxwtjr$C_lrbxnmnq;)Lnet/minecraft/unmapped/C_rhqekity$C_kafolqyy; - ARG 0 factory + FIELD f_ouzzcuuw children Ljava/util/List; + METHOD m_suvxbgwp combine (Ljava/util/List;)Lnet/minecraft/unmapped/C_pseivtsw; CLASS C_lrbxnmnq Factory - METHOD create create ([Lnet/minecraft/unmapped/C_rhqekity;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_ltwxwtjr; - ARG 1 children - ARG 2 conditions diff --git a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping index f201fa4cb7..6f118b130f 100644 --- a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping +++ b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping @@ -1,16 +1,4 @@ CLASS net/minecraft/unmapped/C_zhrhwmst net/minecraft/loot/entry/DynamicEntry FIELD f_vhluhixp id Lnet/minecraft/unmapped/C_ncpywfca; - METHOD (Lnet/minecraft/unmapped/C_ncpywfca;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)V - ARG 1 id - ARG 2 weight - ARG 3 quality - ARG 4 conditions - ARG 5 functions - METHOD m_mvdqedfx (Lnet/minecraft/unmapped/C_ncpywfca;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_sphmzmsf; - ARG 1 weight - ARG 2 quality - ARG 3 conditions - ARG 4 functions METHOD m_nzgqcojv builder (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 0 name - CLASS C_qkhweiwm Serializer diff --git a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping index b9fd19080e..2318b9f06a 100644 --- a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping +++ b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/unmapped/C_tfbtveio net/minecraft/loot/entry/EmptyEntry METHOD m_ytqrlqnr builder ()Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; - CLASS C_prajoomi Serializer diff --git a/mappings/net/minecraft/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/loot/entry/GroupEntry.mapping index c0adb1bff0..e928f2f2b9 100644 --- a/mappings/net/minecraft/loot/entry/GroupEntry.mapping +++ b/mappings/net/minecraft/loot/entry/GroupEntry.mapping @@ -4,10 +4,10 @@ CLASS net/minecraft/unmapped/C_wgckbuqq net/minecraft/loot/entry/GroupEntry ARG 3 choiceConsumer METHOD m_yqtybzuy create ([Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_wgckbuqq$C_qhkxplmh; ARG 0 entries - METHOD m_ywhezgmx ([Lnet/minecraft/unmapped/C_pseivtsw;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)Z + METHOD m_ywhezgmx (Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander CLASS C_qhkxplmh Builder - FIELD f_gmcjipav entries Ljava/util/List; + FIELD f_gmcjipav entries Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)V ARG 1 entries diff --git a/mappings/net/minecraft/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/loot/entry/ItemEntry.mapping index 6a3fded523..60c273ef31 100644 --- a/mappings/net/minecraft/loot/entry/ItemEntry.mapping +++ b/mappings/net/minecraft/loot/entry/ItemEntry.mapping @@ -1,16 +1,4 @@ CLASS net/minecraft/unmapped/C_jcfkxpss net/minecraft/loot/entry/ItemEntry - FIELD f_bgmjssqx item Lnet/minecraft/unmapped/C_vorddnax; - METHOD (Lnet/minecraft/unmapped/C_vorddnax;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)V - ARG 1 item - ARG 2 weight - ARG 3 quality - ARG 4 conditions - ARG 5 functions + FIELD f_bgmjssqx item Lnet/minecraft/unmapped/C_cjzoxshv; METHOD m_qpmzyufd builder (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 0 drop - METHOD m_tgdwntmg (Lnet/minecraft/unmapped/C_gmbqjnle;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_sphmzmsf; - ARG 1 weight - ARG 2 quality - ARG 3 conditions - ARG 4 functions - CLASS C_ghltjqxg Serializer diff --git a/mappings/net/minecraft/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/loot/entry/LeafEntry.mapping index 3010b14d7a..3990384e3b 100644 --- a/mappings/net/minecraft/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LeafEntry.mapping @@ -3,44 +3,26 @@ CLASS net/minecraft/unmapped/C_sphmzmsf net/minecraft/loot/entry/LeafEntry FIELD f_nqxxtcze DEFAULT_QUALITY I FIELD f_orhqpvhl DEFAULT_WEIGHT I FIELD f_rfavzwgx choice Lnet/minecraft/unmapped/C_iozoltsq; - FIELD f_rxzrzurl functions [Lnet/minecraft/unmapped/C_tmxhskql; + FIELD f_rxzrzurl functions Ljava/util/List; FIELD f_wauvnusi weight I FIELD f_zccepqpd compiledFunctions Ljava/util/function/BiFunction; - METHOD (II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)V - ARG 1 weight - ARG 2 quality - ARG 3 conditions - ARG 4 functions METHOD m_dlwclfgf builder (Lnet/minecraft/unmapped/C_sphmzmsf$C_wkmtcodm;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 0 factory METHOD m_jptxqkrt generateLoot (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_iakykpgh;)V ARG 1 lootConsumer ARG 2 context CLASS C_agvvrbll Choice - CLASS C_bgfiwqyg Serializer - METHOD m_kqtlszkl fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_sphmzmsf; - ARG 1 entryJson - ARG 2 context - ARG 3 weight - ARG 4 quality - ARG 5 conditions - ARG 6 functions CLASS C_lbxiirfw Builder FIELD f_pfukqpjm weight I FIELD f_uaqhgatq quality I - FIELD f_zycpzeee functions Ljava/util/List; + FIELD f_zycpzeee functions Lcom/google/common/collect/ImmutableList$Builder; METHOD m_biuwnwbs quality (I)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 1 quality METHOD m_fuervfbq weight (I)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 1 weight - METHOD m_jriszyxs getFunctions ()[Lnet/minecraft/unmapped/C_tmxhskql; + METHOD m_jriszyxs getFunctions ()Ljava/util/List; CLASS C_uwpqggtm BasicBuilder FIELD f_nounyfdb factory Lnet/minecraft/unmapped/C_sphmzmsf$C_wkmtcodm; METHOD (Lnet/minecraft/unmapped/C_sphmzmsf$C_wkmtcodm;)V ARG 1 factory CLASS C_wkmtcodm Factory - METHOD build build (II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_sphmzmsf; - ARG 1 weight - ARG 2 quality - ARG 3 conditions - ARG 4 functions diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping index 20fea4e002..b29f213ae2 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping @@ -1,26 +1,15 @@ CLASS net/minecraft/unmapped/C_rhqekity net/minecraft/loot/entry/LootPoolEntry FIELD f_fgvzyvok conditionPredicate Ljava/util/function/Predicate; - FIELD f_gokrsceb conditions [Lnet/minecraft/unmapped/C_vqkczpuv; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;)V - ARG 1 conditions + FIELD f_gokrsceb conditions Ljava/util/List; METHOD m_dvurehnl getType ()Lnet/minecraft/unmapped/C_auonnuzf; METHOD m_wekrdfxi validate (Lnet/minecraft/unmapped/C_eumtgsbp;)V ARG 1 reporter METHOD m_xojylage test (Lnet/minecraft/unmapped/C_iakykpgh;)Z ARG 1 context - CLASS C_kafolqyy Serializer - METHOD m_dbgwigeh fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_rhqekity; - ARG 1 json - ARG 2 context - ARG 3 conditions - METHOD m_kphwxmuw addEntryFields (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_rhqekity;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 entry - ARG 3 context CLASS C_ygespcrj Builder - FIELD f_haxuojpz conditions Ljava/util/List; + FIELD f_haxuojpz conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD m_apbjmmdr build ()Lnet/minecraft/unmapped/C_rhqekity; - METHOD m_bpiuasgz getConditions ()[Lnet/minecraft/unmapped/C_vqkczpuv; + METHOD m_bpiuasgz getConditions ()Ljava/util/List; METHOD m_fefekaqh groupEntry (Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_sjkteven$C_pzgnuiza; ARG 1 entry METHOD m_wpubrshx sequenceEntry (Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_wgckbuqq$C_qhkxplmh; diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping index 9a57fa581c..f8a6383e40 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/unmapped/C_jlrlpzup net/minecraft/loot/entry/LootPoolEntryTypes COMMENT Contains the different loot pool entry types available in the Vanilla game. - METHOD m_vsmztfym register (Ljava/lang/String;Lnet/minecraft/unmapped/C_qdtgrmkp;)Lnet/minecraft/unmapped/C_auonnuzf; + METHOD m_vsmztfym register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_auonnuzf; ARG 0 id - ARG 1 jsonSerializer - METHOD m_xqjaprog createGsonSerializer ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 5c586635d8..122fc80e82 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,11 +1,4 @@ CLASS net/minecraft/unmapped/C_cwomcypw net/minecraft/loot/entry/LootTableEntry FIELD f_smistaso id Lnet/minecraft/unmapped/C_ncpywfca; - METHOD (Lnet/minecraft/unmapped/C_ncpywfca;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)V - ARG 1 id - ARG 2 weight - ARG 3 quality - ARG 4 conditions - ARG 5 functions METHOD m_tbgjjtgz builder (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 0 id - CLASS C_vlowpyug Serializer diff --git a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping index c8d2dd704b..db6d996146 100644 --- a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping +++ b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/unmapped/C_sjkteven net/minecraft/loot/entry/SequenceEntry METHOD m_hzodzspy create ([Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_sjkteven$C_pzgnuiza; ARG 0 entries - METHOD m_vgukpknj ([Lnet/minecraft/unmapped/C_pseivtsw;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)Z + METHOD m_vgukpknj (Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander CLASS C_pzgnuiza Builder - FIELD f_baofbiww entries Ljava/util/List; + FIELD f_baofbiww entries Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)V ARG 1 entries diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index b2f26606d7..7a3e42343d 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/unmapped/C_momunagf net/minecraft/loot/entry/TagEntry FIELD f_uvcitzvc expand Z FIELD f_yobnrkgd tag Lnet/minecraft/unmapped/C_ednuhnnn; - METHOD (Lnet/minecraft/unmapped/C_ednuhnnn;ZII[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)V - ARG 1 tag - ARG 2 expand - ARG 3 weight - ARG 4 quality - ARG 5 conditions - ARG 6 functions METHOD m_almtihoz builder (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 0 tag METHOD m_biptwiwa expandTag (Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)Z @@ -15,16 +8,3 @@ CLASS net/minecraft/unmapped/C_momunagf net/minecraft/loot/entry/TagEntry ARG 2 choiceConsumer METHOD m_ceqomzae expandBuilder (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 0 tag - METHOD m_dcsjuxdp (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_cjzoxshv;)V - ARG 1 item - METHOD m_gtknzuho (Lnet/minecraft/unmapped/C_ednuhnnn;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_sphmzmsf; - ARG 1 weight - ARG 2 quality - ARG 3 conditions - ARG 4 functions - METHOD m_idxjjxnc (Lnet/minecraft/unmapped/C_ednuhnnn;II[Lnet/minecraft/unmapped/C_vqkczpuv;[Lnet/minecraft/unmapped/C_tmxhskql;)Lnet/minecraft/unmapped/C_sphmzmsf; - ARG 1 weight - ARG 2 quality - ARG 3 conditions - ARG 4 functions - CLASS C_smuljyjm Serializer diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 984b7b2c59..4cb3e20ec4 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -1,64 +1,35 @@ CLASS net/minecraft/unmapped/C_mxqfevzh net/minecraft/loot/function/ApplyBonusLootFunction FIELD f_ojkdftuu FACTORIES Ljava/util/Map; FIELD f_wsorvvwo formula Lnet/minecraft/unmapped/C_mxqfevzh$C_xgjrgsyv; - FIELD f_wsrpgatr enchantment Lnet/minecraft/unmapped/C_jxtrubuh; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_mxqfevzh$C_xgjrgsyv;)V - ARG 1 conditions - ARG 2 enchantment - ARG 3 formula - METHOD m_bxedcscl (Lnet/minecraft/unmapped/C_jxtrubuh;I[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 2 conditions - METHOD m_cyhsolpa (Lnet/minecraft/unmapped/C_jxtrubuh;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions + FIELD f_wsrpgatr enchantment Lnet/minecraft/unmapped/C_cjzoxshv; METHOD m_lngedsfm oreDrops (Lnet/minecraft/unmapped/C_jxtrubuh;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 enchantment - METHOD m_mnxhoahh (Lnet/minecraft/unmapped/C_jxtrubuh;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions METHOD m_tghqmevs uniformBonusCount (Lnet/minecraft/unmapped/C_jxtrubuh;I)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 enchantment ARG 1 bonusMultiplier METHOD m_vjyqbuku uniformBonusCount (Lnet/minecraft/unmapped/C_jxtrubuh;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 enchantment - METHOD m_waezeuii (Lnet/minecraft/unmapped/C_jxtrubuh;IF[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 3 conditions METHOD m_ziaghyfl binomialWithBonusCount (Lnet/minecraft/unmapped/C_jxtrubuh;FI)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 enchantment ARG 1 probability ARG 2 extra CLASS C_biovkyio UniformBonusCount - FIELD f_esqxbmse ID Lnet/minecraft/unmapped/C_ncpywfca; + FIELD f_esqxbmse ID Lnet/minecraft/unmapped/C_mxqfevzh$C_jvsyolwg; FIELD f_rgjbhdsi bonusMultiplier I METHOD (I)V ARG 1 bonusMultiplier - METHOD m_ifdxexhr fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/unmapped/C_mxqfevzh$C_xgjrgsyv; - ARG 0 json - ARG 1 context CLASS C_hanmcnrw BinomialWithBonusCount FIELD f_dkhgjnjn probability F FIELD f_gfcgztke extra I - FIELD f_keeobved ID Lnet/minecraft/unmapped/C_ncpywfca; + FIELD f_keeobved ID Lnet/minecraft/unmapped/C_mxqfevzh$C_jvsyolwg; METHOD (IF)V ARG 1 extra ARG 2 probability - METHOD m_ikmkvgpj fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/unmapped/C_mxqfevzh$C_xgjrgsyv; - ARG 0 json - ARG 1 context CLASS C_kdmdxtir OreDrops - FIELD f_yejmklyj ID Lnet/minecraft/unmapped/C_ncpywfca; - METHOD m_dzvxbppb fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/unmapped/C_mxqfevzh$C_xgjrgsyv; - ARG 0 json - ARG 1 context - CLASS C_lhzikvjo FormulaFactory - METHOD deserialize deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/unmapped/C_mxqfevzh$C_xgjrgsyv; - ARG 1 functionJson - ARG 2 context + FIELD f_yejmklyj ID Lnet/minecraft/unmapped/C_mxqfevzh$C_jvsyolwg; CLASS C_xgjrgsyv Formula METHOD m_fnotbtqz getValue (Lnet/minecraft/unmapped/C_rlomrsco;II)I ARG 1 random ARG 2 initialCount ARG 3 enchantmentLevel - METHOD m_fvswhxxp toJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 context - METHOD m_ouuxqwxu getId ()Lnet/minecraft/unmapped/C_ncpywfca; - CLASS C_zehroayq Serializer + METHOD m_ouuxqwxu getId ()Lnet/minecraft/unmapped/C_mxqfevzh$C_jvsyolwg; diff --git a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping index fef19952b7..569451e37e 100644 --- a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/unmapped/C_krisseon net/minecraft/loot/function/ConditionalLootFunction FIELD f_eefssiwv predicate Ljava/util/function/Predicate; - FIELD f_ksptazzw conditions [Lnet/minecraft/unmapped/C_vqkczpuv; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;)V - ARG 1 conditions + FIELD f_ksptazzw conditions Ljava/util/List; METHOD apply apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 itemStack ARG 2 context @@ -12,15 +10,10 @@ CLASS net/minecraft/unmapped/C_krisseon net/minecraft/loot/function/ConditionalL METHOD m_wklwxxae builder (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 joiner CLASS C_nhpzaayj Builder - FIELD f_oeqfqpfz conditionList Ljava/util/List; + FIELD f_oeqfqpfz conditionList Lcom/google/common/collect/ImmutableList$Builder; METHOD m_euckszcs getThisBuilder ()Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; - METHOD m_smtozhrq getConditions ()[Lnet/minecraft/unmapped/C_vqkczpuv; + METHOD m_smtozhrq getConditions ()Ljava/util/List; CLASS C_sjodwzdq Joiner FIELD f_whldtbne joiner Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 joiner - CLASS C_xihcjzzg Serializer - METHOD m_xivoziws fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_krisseon; - ARG 1 json - ARG 2 context - ARG 3 conditions diff --git a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping index 52c9c11076..c8d52bae38 100644 --- a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping @@ -1,18 +1,10 @@ CLASS net/minecraft/unmapped/C_nczwqnwe net/minecraft/loot/function/CopyNameLootFunction FIELD f_perqlghk source Lnet/minecraft/unmapped/C_nczwqnwe$C_ysmhgjrm; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_nczwqnwe$C_ysmhgjrm;)V - ARG 1 conditions - ARG 2 source - METHOD m_bafccihl (Lnet/minecraft/unmapped/C_nczwqnwe$C_ysmhgjrm;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions METHOD m_rekafxcr builder (Lnet/minecraft/unmapped/C_nczwqnwe$C_ysmhgjrm;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 source - CLASS C_rwwnxsch Serializer CLASS C_ysmhgjrm Source FIELD f_mhpaurpb parameter Lnet/minecraft/unmapped/C_xsaigefq; FIELD f_mzrcryzs name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/unmapped/C_xsaigefq;)V ARG 3 name ARG 4 parameter - METHOD m_mutwetxp get (Ljava/lang/String;)Lnet/minecraft/unmapped/C_nczwqnwe$C_ysmhgjrm; - ARG 0 name diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index 256fc24617..343047d076 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -1,18 +1,10 @@ CLASS net/minecraft/unmapped/C_nucjwigk net/minecraft/loot/function/CopyNbtLootFunction FIELD f_hmsscfme operations Ljava/util/List; FIELD f_tdpizdcn source Lnet/minecraft/unmapped/C_oipfkqpe; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_oipfkqpe;Ljava/util/List;)V - ARG 1 conditions - ARG 2 source - ARG 3 operations METHOD m_jgbxsfrw builder (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_nucjwigk$C_eefjabbk; ARG 0 target METHOD m_jnkzguqh builder (Lnet/minecraft/unmapped/C_oipfkqpe;)Lnet/minecraft/unmapped/C_nucjwigk$C_eefjabbk; ARG 0 source - METHOD m_kiciqylh (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_nucjwigk$C_xhinaiyn;)V - ARG 2 operation - METHOD m_xllrozzq parseNbtPath (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey; - ARG 0 nbtPath CLASS C_eefjabbk Builder FIELD f_hfkquohg operations Ljava/util/List; FIELD f_jpsdflnc source Lnet/minecraft/unmapped/C_oipfkqpe; @@ -25,13 +17,10 @@ CLASS net/minecraft/unmapped/C_nucjwigk net/minecraft/loot/function/CopyNbtLootF METHOD m_phzxvxnd withOperation (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_nucjwigk$C_eefjabbk; ARG 1 source ARG 2 target - CLASS C_icouqdpn Serializer CLASS C_xfgvgkti Operator FIELD f_mpzghbkk name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name - METHOD m_ddhtlfac get (Ljava/lang/String;)Lnet/minecraft/unmapped/C_nucjwigk$C_xfgvgkti; - ARG 0 name METHOD m_sfexkgbm merge (Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey;Ljava/util/List;)V ARG 1 nbt ARG 2 targetPath @@ -48,17 +37,8 @@ CLASS net/minecraft/unmapped/C_nucjwigk net/minecraft/loot/function/CopyNbtLootF ARG 1 __nbt CLASS C_xhinaiyn Operation FIELD f_drhhtffa operator Lnet/minecraft/unmapped/C_nucjwigk$C_xfgvgkti; - FIELD f_hdxmmequ sourcePath Ljava/lang/String; - FIELD f_hrwaqvbq parsedTargetPath Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey; - FIELD f_mpvvnrzd targetPath Ljava/lang/String; - FIELD f_vnqirsdz parsedSourcePath Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey; - METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_nucjwigk$C_xfgvgkti;)V - ARG 1 sourcePath - ARG 2 targetPath - ARG 3 operator - METHOD m_lqzdtpls toJson ()Lcom/google/gson/JsonObject; + FIELD f_hrwaqvbq parsedTargetPath Lnet/minecraft/unmapped/C_nucjwigk$C_dhznmrku; + FIELD f_vnqirsdz parsedSourcePath Lnet/minecraft/unmapped/C_nucjwigk$C_dhznmrku; METHOD m_ppualgxh execute (Ljava/util/function/Supplier;Lnet/minecraft/unmapped/C_oivssbvb;)V ARG 1 itemTagTagGetter ARG 2 nbt - METHOD m_vwvqhiyg fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_nucjwigk$C_xhinaiyn; - ARG 0 json diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index 478822bf05..ebd774d765 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -1,25 +1,14 @@ CLASS net/minecraft/unmapped/C_wvgabkvo net/minecraft/loot/function/CopyStateFunction - FIELD f_pyckvicf block Lnet/minecraft/unmapped/C_mmxmpdoq; + FIELD f_pyckvicf block Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_webqigsf properties Ljava/util/Set; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/Set;)V - ARG 1 conditions - ARG 2 block - ARG 3 properties METHOD m_frpexygr getPropertyName (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vzlztuyw;)Ljava/lang/String; ARG 0 state ARG 1 property METHOD m_nwoyzure getBuilder (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_wvgabkvo$C_hmjhprvz; ARG 0 block - METHOD m_qhxznrbn (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vzlztuyw;)V - ARG 2 property - CLASS C_drdriajw Serializer - METHOD m_dhawcocg (Ljava/util/Set;Lnet/minecraft/unmapped/C_ezfeikaq;Lcom/google/gson/JsonElement;)V - ARG 2 element - METHOD m_zdjfbams (Lcom/google/gson/JsonArray;Lnet/minecraft/unmapped/C_vzlztuyw;)V - ARG 1 property CLASS C_hmjhprvz Builder - FIELD f_ranxfdgt properties Ljava/util/Set; - FIELD f_togdpkuz block Lnet/minecraft/unmapped/C_mmxmpdoq; + FIELD f_ranxfdgt properties Lcom/google/common/collect/ImmutableSet$Builder; + FIELD f_togdpkuz block Lnet/minecraft/unmapped/C_cjzoxshv; METHOD (Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 block METHOD m_iidorfgo addProperty (Lnet/minecraft/unmapped/C_vzlztuyw;)Lnet/minecraft/unmapped/C_wvgabkvo$C_hmjhprvz; diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index caa787c58e..032891f556 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -1,21 +1,13 @@ CLASS net/minecraft/unmapped/C_mcyropux net/minecraft/loot/function/EnchantRandomlyLootFunction - FIELD f_dtvmmsyz enchantments Ljava/util/List; + FIELD f_dtvmmsyz enchantments Ljava/util/Optional; FIELD f_hmtatkky LOGGER Lorg/slf4j/Logger; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Ljava/util/Collection;)V - ARG 1 conditions - ARG 2 enchantments - METHOD m_enujhsln (ZLnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jxtrubuh;)Z - ARG 2 enchantment METHOD m_hgxjeanh builder ()Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; - METHOD m_mtkgmoaz ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 0 conditions METHOD m_oylffrhc create ()Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb; METHOD m_susyvyur addEnchantmentToStack (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 stack ARG 1 enchantment ARG 2 random - CLASS C_hnezsimz Serializer CLASS C_xyziffnb Builder - FIELD f_nsjghzzi enchantments Ljava/util/Set; + FIELD f_nsjghzzi enchantments Ljava/util/List; METHOD m_blmnznah add (Lnet/minecraft/unmapped/C_jxtrubuh;)Lnet/minecraft/unmapped/C_mcyropux$C_xyziffnb; ARG 1 enchantment diff --git a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping index ddffddcfcc..b90c8ea700 100644 --- a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping @@ -1,13 +1,8 @@ CLASS net/minecraft/unmapped/C_hujvlqyo net/minecraft/loot/function/EnchantWithLevelsLootFunction FIELD f_mdbmdlse treasureEnchantmentsAllowed Z FIELD f_uznihzkv range Lnet/minecraft/unmapped/C_iajmfyig; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_iajmfyig;Z)V - ARG 1 condition - ARG 2 range - ARG 3 treasureEnchantmentsAllowed METHOD m_baumhjth builder (Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_hujvlqyo$C_ukmrinhh; ARG 0 range - CLASS C_abuaucax Serializer CLASS C_ukmrinhh Builder FIELD f_lbjnpjmb range Lnet/minecraft/unmapped/C_iajmfyig; FIELD f_wlroxill treasureEnchantmentsAllowed Z diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index de8dc62aab..e640214481 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -1,23 +1,14 @@ CLASS net/minecraft/unmapped/C_agamcpit net/minecraft/loot/function/ExplorationMapLootFunction FIELD f_caghqjxy DEFAULT_ZOOM B - FIELD f_cyksjmpe MANSION Ljava/lang/String; FIELD f_ftlspkcc zoom B FIELD f_hcoxskny DEFAULT_DECORATION Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee; FIELD f_kwsynvqy DEFAULT_SEARCH_RADIUS I FIELD f_muoghezg skipExistingChunks Z FIELD f_nnyepwvq DEFAULT_DESTINATION Lnet/minecraft/unmapped/C_ednuhnnn; FIELD f_ppwrjwsv destination Lnet/minecraft/unmapped/C_ednuhnnn; - FIELD f_qdkctvwr LOGGER Lorg/slf4j/Logger; FIELD f_untgepxl DEFAULT_SKIP_EXISTING_CHUNKS Z FIELD f_wghktgek decoration Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee; FIELD f_zsjqjijf searchRadius I - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;BIZ)V - ARG 1 conditions - ARG 2 destination - ARG 3 decoration - ARG 4 zoom - ARG 5 searchRadius - ARG 6 skipExistingChunks METHOD m_wohfxtpc create ()Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz; CLASS C_iwhmdhnz Builder FIELD f_apimqzhk skipExistingChunks Z @@ -35,6 +26,3 @@ CLASS net/minecraft/unmapped/C_agamcpit net/minecraft/loot/function/ExplorationM ARG 1 zoom METHOD m_zdjsolou withSkipExistingChunks (Z)Lnet/minecraft/unmapped/C_agamcpit$C_iwhmdhnz; ARG 1 skipExistingChunks - CLASS C_xvstldle Serializer - METHOD m_jquvwymz getDestination (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_ednuhnnn; - ARG 0 json diff --git a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping index a6564d2bf0..ebef54dc9e 100644 --- a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/unmapped/C_nyfkjprg net/minecraft/loot/function/ExplosionDecayLootFunction METHOD m_qsggbyca builder ()Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; - CLASS C_gpmevfte Serializer diff --git a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping index cf23bb2b55..b8e96ec436 100644 --- a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/unmapped/C_nfxlhrhd net/minecraft/loot/function/FillPlayerHeadLootFunction FIELD f_qlhatnhe entity Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)V - ARG 1 conditions - ARG 2 entity - METHOD m_fsbpvmwb (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions METHOD m_znliikgp builder (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 target - CLASS C_iqkeqcoo Serializer diff --git a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping index ceb1161bc0..10a2d8b0e5 100644 --- a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/unmapped/C_rqzfhvkt net/minecraft/loot/function/FurnaceSmeltLootFunction FIELD f_izxcikvc LOGGER Lorg/slf4j/Logger; METHOD m_rwvyhsgu builder ()Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; - CLASS C_scjjlrtq Serializer diff --git a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping index d411b66343..3c5a3b5058 100644 --- a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/unmapped/C_oluvnikk net/minecraft/loot/function/LimitCountLootFunction FIELD f_czspugcs limit Lnet/minecraft/unmapped/C_rcavspxn; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_rcavspxn;)V - ARG 1 conditions - ARG 2 limit METHOD m_atenogwe builder (Lnet/minecraft/unmapped/C_rcavspxn;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 limit - METHOD m_zphkmqad (Lnet/minecraft/unmapped/C_rcavspxn;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions - CLASS C_orzhhraa Serializer diff --git a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index ad7d4fc3de..3980f015c8 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -3,15 +3,9 @@ CLASS net/minecraft/unmapped/C_daukiiao net/minecraft/loot/function/LootFunction METHOD m_dnlzaiaw (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 0 stack ARG 1 context - METHOD m_niydmnlv join ([Ljava/util/function/BiFunction;)Ljava/util/function/BiFunction; - ARG 0 lootFunctions - METHOD m_pqvcpkan register (Ljava/lang/String;Lnet/minecraft/unmapped/C_qdtgrmkp;)Lnet/minecraft/unmapped/C_jjwwswyo; + METHOD m_niydmnlv join (Ljava/util/List;)Ljava/util/function/BiFunction; + METHOD m_pqvcpkan register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_jjwwswyo; ARG 0 id - ARG 1 jsonSerializer - METHOD m_qhbvkajh createGsonSerializer ()Ljava/lang/Object; - METHOD m_slmffabk ([Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_sddaxwyk; - ARG 1 stack - ARG 2 context - METHOD m_zibxsdav (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_sddaxwyk; + METHOD m_slmffabk (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 2 stack ARG 3 context diff --git a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping index 9d210195a6..02ddcc703a 100644 --- a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping @@ -2,14 +2,9 @@ CLASS net/minecraft/unmapped/C_efigwszm net/minecraft/loot/function/LootingEncha FIELD f_ffgvxzqf NO_LIMIT I FIELD f_mmchuppf limit I FIELD f_xbeatkda countRange Lnet/minecraft/unmapped/C_iajmfyig; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_iajmfyig;I)V - ARG 1 conditions - ARG 2 countRange - ARG 3 limit METHOD m_nhvreoaw builder (Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_efigwszm$C_ysflxdvk; ARG 0 countRange METHOD m_ripnvadf hasLimit ()Z - CLASS C_qqniwinm Serializer CLASS C_ysflxdvk Builder FIELD f_keabpfag countRange Lnet/minecraft/unmapped/C_iajmfyig; FIELD f_wpdaqabr limit I diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index f584330853..b96c1288dd 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -1,52 +1,24 @@ CLASS net/minecraft/unmapped/C_brhhfbvx net/minecraft/loot/function/SetAttributesLootFunction FIELD f_ubfewkkt attributes Ljava/util/List; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Ljava/util/List;)V - ARG 1 conditions - ARG 2 attributes - METHOD m_iiczclll create (Ljava/lang/String;Lnet/minecraft/unmapped/C_ppzfbbsy;Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_brhhfbvx$C_xadeusls; + METHOD m_iiczclll create (Ljava/lang/String;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_brhhfbvx$C_xadeusls; ARG 0 name - ARG 1 attribute ARG 2 operation ARG 3 amountRange - METHOD m_pjnxhehl (Lnet/minecraft/unmapped/C_brhhfbvx$C_mhxntjah;)Ljava/util/stream/Stream; - ARG 0 attribute METHOD m_ynrasumo create ()Lnet/minecraft/unmapped/C_brhhfbvx$C_zekudcle; - CLASS C_lkujvrlc Serializer CLASS C_mhxntjah Attribute - FIELD f_jhxyegab slots [Lnet/minecraft/unmapped/C_yuycoehb; + FIELD f_jhxyegab slots Ljava/util/List; FIELD f_oicvpvzj amount Lnet/minecraft/unmapped/C_iajmfyig; - FIELD f_omfilcco attribute Lnet/minecraft/unmapped/C_ppzfbbsy; + FIELD f_omfilcco attribute Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_trimohgc name Ljava/lang/String; FIELD f_vluieboi operation Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs; - FIELD f_xvaghlfs id Ljava/util/UUID; - METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_ppzfbbsy;Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;Lnet/minecraft/unmapped/C_iajmfyig;[Lnet/minecraft/unmapped/C_yuycoehb;Ljava/util/UUID;)V - ARG 1 name - ARG 2 attribute - ARG 3 operation - ARG 4 amount - ARG 5 slots - ARG 6 id - METHOD m_fpsqlgou deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/unmapped/C_brhhfbvx$C_mhxntjah; - ARG 0 json - ARG 1 context - METHOD m_lchponqn getName (Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Ljava/lang/String; - ARG 0 operation - METHOD m_yzqnghgj fromName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs; - ARG 0 name - METHOD m_zmtryazr serialize (Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonObject; - ARG 1 context + FIELD f_xvaghlfs id Ljava/util/Optional; CLASS C_xadeusls AttributeBuilder FIELD f_circzibp operation Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs; FIELD f_dbvpqaqe amount Lnet/minecraft/unmapped/C_iajmfyig; - FIELD f_joycqqfg uuid Ljava/util/UUID; - FIELD f_tpzskcnm attribute Lnet/minecraft/unmapped/C_ppzfbbsy; + FIELD f_joycqqfg uuid Ljava/util/Optional; + FIELD f_tpzskcnm attribute Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_wednckml name Ljava/lang/String; FIELD f_zapntexo slots Ljava/util/Set; - METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_ppzfbbsy;Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;Lnet/minecraft/unmapped/C_iajmfyig;)V - ARG 1 name - ARG 2 attribute - ARG 3 operation - ARG 4 amount METHOD m_fewrdwnz build ()Lnet/minecraft/unmapped/C_brhhfbvx$C_mhxntjah; METHOD m_gxbzidyh slot (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_brhhfbvx$C_xadeusls; ARG 1 slot diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index e2ff9b277a..73d5b2f71d 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -1,17 +1,8 @@ CLASS net/minecraft/unmapped/C_azqpglil net/minecraft/loot/function/SetBannerPatternFunction FIELD f_szlyryrw append Z FIELD f_updalbpy patterns Ljava/util/List; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Ljava/util/List;Z)V - ARG 1 conditions - ARG 2 patterns - ARG 3 append METHOD m_lkzkigrd builder (Z)Lnet/minecraft/unmapped/C_azqpglil$C_tfnaakyb; ARG 0 append - CLASS C_mnyiffbs Serializer - METHOD m_hjxzktxi (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 patternAndColor - METHOD m_nlchmzke (Lcom/mojang/datafixers/util/Pair;)Lcom/google/gson/JsonSyntaxException; - ARG 0 patterns CLASS C_tfnaakyb Builder FIELD f_jxdddfui patterns Lcom/google/common/collect/ImmutableList$Builder; FIELD f_zslcyivh append Z diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index 5aa70369e6..be7fa8f1e5 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -1,21 +1,12 @@ CLASS net/minecraft/unmapped/C_zwjmmlxa net/minecraft/loot/function/SetContentsLootFunction FIELD f_nbcugmpv entries Ljava/util/List; - FIELD f_ygnjduir type Lnet/minecraft/unmapped/C_wgqvodus; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_wgqvodus;Ljava/util/List;)V - ARG 1 conditions - ARG 2 type - ARG 3 entries - METHOD m_dteiceip (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_rnrfftze;Lnet/minecraft/unmapped/C_rhqekity;)V - ARG 2 entry + FIELD f_ygnjduir type Lnet/minecraft/unmapped/C_cjzoxshv; METHOD m_eupdzfta builder (Lnet/minecraft/unmapped/C_wgqvodus;)Lnet/minecraft/unmapped/C_zwjmmlxa$C_fgnbywgn; ARG 0 type - METHOD m_wpeehdcu (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_rnrfftze;Lnet/minecraft/unmapped/C_iozoltsq;)V - ARG 2 choice CLASS C_fgnbywgn Builder FIELD f_nggujbuo type Lnet/minecraft/unmapped/C_wgqvodus; - FIELD f_nzftxexh entries Ljava/util/List; + FIELD f_nzftxexh entries Lcom/google/common/collect/ImmutableList$Builder; METHOD (Lnet/minecraft/unmapped/C_wgqvodus;)V ARG 1 type METHOD m_gqwizxli withEntry (Lnet/minecraft/unmapped/C_rhqekity$C_ygespcrj;)Lnet/minecraft/unmapped/C_zwjmmlxa$C_fgnbywgn; ARG 1 entryBuilder - CLASS C_wojeiarc Serializer diff --git a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index 5ad0669a13..c2d8fb7d7e 100644 --- a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -1,17 +1,8 @@ CLASS net/minecraft/unmapped/C_dxxjuyma net/minecraft/loot/function/SetCountLootFunction FIELD f_gadtfxiq add Z FIELD f_mybuvtwj countRange Lnet/minecraft/unmapped/C_iajmfyig; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_iajmfyig;Z)V - ARG 1 conditions - ARG 2 countRange - ARG 3 add METHOD m_gaeejsvd builder (Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 countRange METHOD m_glatashz builder (Lnet/minecraft/unmapped/C_iajmfyig;Z)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 countRange ARG 1 add - METHOD m_ledcoxxd (Lnet/minecraft/unmapped/C_iajmfyig;Z[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 2 conditions - METHOD m_retvxxdf (Lnet/minecraft/unmapped/C_iajmfyig;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions - CLASS C_xemzupcl Serializer diff --git a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index 7b908456a9..93d926b688 100644 --- a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -2,17 +2,8 @@ CLASS net/minecraft/unmapped/C_wkslhogk net/minecraft/loot/function/SetDamageLoo FIELD f_csgafpqh durabilityRange Lnet/minecraft/unmapped/C_iajmfyig; FIELD f_ucdkbvam add Z FIELD f_zdwmwdbb LOGGER Lorg/slf4j/Logger; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_iajmfyig;Z)V - ARG 1 conditions - ARG 2 durabilityRange - ARG 3 add - METHOD m_hslbpeqi (Lnet/minecraft/unmapped/C_iajmfyig;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions METHOD m_jsjekkxl builder (Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 durabilityRange - METHOD m_tkgusfaj (Lnet/minecraft/unmapped/C_iajmfyig;Z[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 2 conditions METHOD m_yqlwlovm builder (Lnet/minecraft/unmapped/C_iajmfyig;Z)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 durabilityRange ARG 1 add - CLASS C_tfijezuy Serializer diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index 281cc02124..ab0d2347c3 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -1,37 +1,13 @@ CLASS net/minecraft/unmapped/C_bpyfibfg net/minecraft/loot/function/SetEnchantmentsLootFunction FIELD f_lrrfbeoq enchantments Ljava/util/Map; FIELD f_unibonct add Z - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Ljava/util/Map;Z)V - ARG 1 conditions - ARG 2 enchantments - ARG 3 add - METHOD m_bzpmkgqc (Ljava/util/Map;Lnet/minecraft/unmapped/C_jxtrubuh;Ljava/lang/Integer;)V - ARG 1 enchantment - ARG 2 level - METHOD m_ciarzsuj (Ljava/util/Map;Lnet/minecraft/unmapped/C_jxtrubuh;Ljava/lang/Integer;)V - ARG 1 enchantment - ARG 2 level - METHOD m_exjzhadm (Lnet/minecraft/unmapped/C_iajmfyig;)Ljava/util/stream/Stream; - ARG 0 numberProvider - METHOD m_grdiinyw addEnchantmentToMap (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_iajmfyig;)V - ARG 0 map - ARG 1 context - ARG 2 enchantment - ARG 3 numberProvider - METHOD m_lumjikvg (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_jxtrubuh;Ljava/lang/Integer;)V - ARG 1 enchantment - ARG 2 level METHOD m_nbraboun addEnchantmentToMap (Ljava/util/Map;Lnet/minecraft/unmapped/C_jxtrubuh;I)V ARG 0 map ARG 1 enchantment ARG 2 level - CLASS C_vpiztwqu Serializer - METHOD m_ptallolb (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_iajmfyig;)V - ARG 2 enchantment - ARG 3 countRange CLASS C_wzimofnb Builder FIELD f_tftgatba add Z - FIELD f_wllspuwj enchantments Ljava/util/Map; + FIELD f_wllspuwj enchantments Lcom/google/common/collect/ImmutableMap$Builder; METHOD (Z)V ARG 1 add METHOD m_emjssomh enchantment (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_bpyfibfg$C_wzimofnb; diff --git a/mappings/net/minecraft/loot/function/SetInstrumentFunction.mapping b/mappings/net/minecraft/loot/function/SetInstrumentFunction.mapping index 710992d743..3ca64f4b12 100644 --- a/mappings/net/minecraft/loot/function/SetInstrumentFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetInstrumentFunction.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/unmapped/C_yethsfxd net/minecraft/loot/function/SetInstrumentFunction FIELD f_lbvcjxbq options Lnet/minecraft/unmapped/C_ednuhnnn; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_ednuhnnn;)V - ARG 1 conditions - ARG 2 options METHOD m_gecwzuvx builder (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 options - METHOD m_lniebhxi (Lnet/minecraft/unmapped/C_ednuhnnn;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions - CLASS C_yckljobz Serializer diff --git a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index 791af01b2d..a9951a834c 100644 --- a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -1,21 +1,11 @@ CLASS net/minecraft/unmapped/C_uaqvnphc net/minecraft/loot/function/SetLootTableLootFunction FIELD f_asvawnnq seed J - FIELD f_krvywmzb type Lnet/minecraft/unmapped/C_wgqvodus; + FIELD f_krvywmzb type Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_sqgmeqhc id Lnet/minecraft/unmapped/C_ncpywfca; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_ncpywfca;JLnet/minecraft/unmapped/C_wgqvodus;)V - ARG 1 conditions - ARG 2 id - ARG 3 seed - ARG 5 type METHOD m_eouxdnns builder (Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 type ARG 1 id - METHOD m_refxahyu (Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_wgqvodus;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 2 conditions METHOD m_slkguszq builder (Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_ncpywfca;J)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 type ARG 1 id ARG 2 seed - METHOD m_umfwigxd (Lnet/minecraft/unmapped/C_ncpywfca;JLnet/minecraft/unmapped/C_wgqvodus;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 4 conditions - CLASS C_kpejxdpg Serializer diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index f78fd31fa9..f6a7e42288 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -1,20 +1,14 @@ CLASS net/minecraft/unmapped/C_tsdbxwal net/minecraft/loot/function/SetLoreLootFunction - FIELD f_bpsimmoz entity Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh; + FIELD f_bpsimmoz entity Ljava/util/Optional; FIELD f_kstuzfle replace Z FIELD f_ysyovrhc lore Ljava/util/List; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;ZLjava/util/List;Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)V - ARG 1 conditions - ARG 2 replace - ARG 3 lore - ARG 4 entity METHOD m_dncphtge getLoreForMerge (Lnet/minecraft/unmapped/C_sddaxwyk;Z)Lnet/minecraft/unmapped/C_hqhtfwlr; ARG 1 stack ARG 2 otherLoreExists METHOD m_tsxjfqqj builder ()Lnet/minecraft/unmapped/C_tsdbxwal$C_rntpxdfh; - CLASS C_ayxemtes Serializer CLASS C_rntpxdfh Builder - FIELD f_iyphffaa target Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh; - FIELD f_xmjucsdk lore Ljava/util/List; + FIELD f_iyphffaa target Ljava/util/Optional; + FIELD f_xmjucsdk lore Lcom/google/common/collect/ImmutableList$Builder; FIELD f_xteaqdej replace Z METHOD m_dvisszfh replace (Z)Lnet/minecraft/unmapped/C_tsdbxwal$C_rntpxdfh; ARG 1 replace diff --git a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping index 15536ed12e..961279465f 100644 --- a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping @@ -1,25 +1,12 @@ CLASS net/minecraft/unmapped/C_wsvkpiky net/minecraft/loot/function/SetNameLootFunction FIELD f_cvsxnvmg LOGGER Lorg/slf4j/Logger; - FIELD f_elaedipn entity Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh; - FIELD f_piwnqeba name Lnet/minecraft/unmapped/C_rdaqiwdt; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)V - ARG 1 conditions - ARG 2 name - ARG 3 entity - METHOD m_avbglogv (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 2 conditions + FIELD f_elaedipn entity Ljava/util/Optional; + FIELD f_piwnqeba name Ljava/util/Optional; METHOD m_mkzkegwm builder (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 name METHOD m_ohquhtnw builder (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 name ARG 1 target - METHOD m_ruzszhwt (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_rdaqiwdt; - ARG 0 textComponent METHOD m_sxelynuf applySourceEntity (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Ljava/util/function/UnaryOperator; ARG 0 context ARG 1 sourceEntity - METHOD m_ymogjess (Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_rdaqiwdt; - ARG 2 textComponent - METHOD m_zkqcrvqz (Lnet/minecraft/unmapped/C_rdaqiwdt;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions - CLASS C_iaxbosrx Serializer diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index bc7e3dfbda..f48ec44b99 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/unmapped/C_arpmpzjb net/minecraft/loot/function/SetNbtLootFunction FIELD f_bgqdwtfp nbt Lnet/minecraft/unmapped/C_hhlwcnih; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_hhlwcnih;)V - ARG 1 conditions - ARG 2 nbt METHOD m_aexqjpfp builder (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 nbt - METHOD m_vrnxohrg (Lnet/minecraft/unmapped/C_hhlwcnih;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions - CLASS C_wrirfgdu Serializer diff --git a/mappings/net/minecraft/loot/function/SetPotionFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionFunction.mapping index 60c63cb4ce..dab071fcda 100644 --- a/mappings/net/minecraft/loot/function/SetPotionFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionFunction.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/unmapped/C_gkzvrccz net/minecraft/loot/function/SetPotionFunction - FIELD f_nitduosl potion Lnet/minecraft/unmapped/C_almkolgw; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_almkolgw;)V - ARG 1 conditions - ARG 2 potion + FIELD f_nitduosl potion Lnet/minecraft/unmapped/C_cjzoxshv; METHOD m_rvqthhip builder (Lnet/minecraft/unmapped/C_almkolgw;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 potion - METHOD m_xagamcfq (Lnet/minecraft/unmapped/C_almkolgw;[Lnet/minecraft/unmapped/C_vqkczpuv;)Lnet/minecraft/unmapped/C_tmxhskql; - ARG 1 conditions - CLASS C_xgspmeyy Serializer diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index e7f8005d66..096214f9e3 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -1,14 +1,6 @@ CLASS net/minecraft/unmapped/C_jktghael net/minecraft/loot/function/SetStewEffectLootFunction - FIELD f_uibdwarm effects Ljava/util/Map; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Ljava/util/Map;)V - ARG 1 conditions - ARG 2 effects METHOD m_exrfwrvg builder ()Lnet/minecraft/unmapped/C_jktghael$C_fqobdjyc; - METHOD m_rbdkpaom (Lnet/minecraft/unmapped/C_iajmfyig;)Ljava/util/stream/Stream; - ARG 0 numberProvider - CLASS C_dyenncmy Serializer CLASS C_fqobdjyc Builder - FIELD f_cpcewrtb map Ljava/util/Map; METHOD m_pkcqyoae withEffect (Lnet/minecraft/unmapped/C_jaqasomh;Lnet/minecraft/unmapped/C_iajmfyig;)Lnet/minecraft/unmapped/C_jktghael$C_fqobdjyc; ARG 1 effect ARG 2 durationRange diff --git a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping index 23ebdf98ba..4029d02325 100644 --- a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping +++ b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping @@ -14,34 +14,19 @@ CLASS net/minecraft/unmapped/C_rcavspxn net/minecraft/loot/operator/BoundedIntUn ARG 1 max METHOD m_gusyvasn createMin (I)Lnet/minecraft/unmapped/C_rcavspxn; ARG 0 min - METHOD m_litivyfw (Lnet/minecraft/unmapped/C_iakykpgh;I)Z + METHOD m_ludylpby (Lnet/minecraft/unmapped/C_iakykpgh;I)I ARG 0 context ARG 1 value - METHOD m_ludylpby (Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iakykpgh;I)Z - ARG 1 context - ARG 2 value - METHOD m_mqqllemb (Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iakykpgh;I)I - ARG 1 context - ARG 2 value METHOD m_mubwvpsn test (Lnet/minecraft/unmapped/C_iakykpgh;I)Z ARG 1 context ARG 2 value - METHOD m_ntorjwdj (Lnet/minecraft/unmapped/C_iakykpgh;I)I - ARG 0 context - ARG 1 value - METHOD m_pipcqbwg (Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iakykpgh;I)I - ARG 1 context - ARG 2 value - METHOD m_rujzgrmk (Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iakykpgh;I)Z + METHOD m_vcjpktjk (Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iakykpgh;I)I ARG 1 context ARG 2 value - METHOD m_vcjpktjk (Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iakykpgh;I)Z - ARG 2 context - ARG 3 value METHOD m_wetskmqh getRequiredParameters ()Ljava/util/Set; - METHOD m_wevtfoso (Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iajmfyig;Lnet/minecraft/unmapped/C_iakykpgh;I)I - ARG 2 context - ARG 3 value + METHOD m_wevtfoso (Lnet/minecraft/unmapped/C_iakykpgh;I)Z + ARG 0 context + ARG 1 value METHOD m_xpjuhcpg createMax (I)Lnet/minecraft/unmapped/C_rcavspxn; ARG 0 max METHOD m_zxylymmk create (I)Lnet/minecraft/unmapped/C_rcavspxn; @@ -54,12 +39,3 @@ CLASS net/minecraft/unmapped/C_rcavspxn net/minecraft/loot/operator/BoundedIntUn METHOD test test (Lnet/minecraft/unmapped/C_iakykpgh;I)Z ARG 1 context ARG 2 value - CLASS C_jxsbegpv Serializer - METHOD deserialize deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping index c6965c3631..845cb43c0b 100644 --- a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/unmapped/C_nctxdqvh net/minecraft/loot/provider/nbt/ContextL FIELD f_pqegqoqw BLOCK_ENTITY_TARGET_NAME Ljava/lang/String; METHOD (Lnet/minecraft/unmapped/C_nctxdqvh$C_jbapaqmi;)V ARG 1 target - METHOD m_kdhpkncb fromTarget (Ljava/lang/String;)Lnet/minecraft/unmapped/C_nctxdqvh; - ARG 0 target METHOD m_meovjpoc fromTarget (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_oipfkqpe; ARG 0 target METHOD m_zaxvalfc getTarget (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_nctxdqvh$C_jbapaqmi; @@ -16,5 +14,3 @@ CLASS net/minecraft/unmapped/C_nctxdqvh net/minecraft/loot/provider/nbt/ContextL METHOD m_uuphueqr getNbt (Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_oivssbvb; ARG 1 context METHOD m_vagagwhx getName ()Ljava/lang/String; - CLASS C_lwbeqxwm Serializer - CLASS C_rcjxtidl CustomSerializer diff --git a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping index ffc7e39630..68545b09bc 100644 --- a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/unmapped/C_lvqtwzzq net/minecraft/loot/provider/nbt/LootNbtProviderTypes - METHOD m_jzypigct register (Ljava/lang/String;Lnet/minecraft/unmapped/C_qdtgrmkp;)Lnet/minecraft/unmapped/C_jcvylpij; + METHOD m_jzypigct register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_jcvylpij; ARG 0 id - ARG 1 jsonSerializer - METHOD m_zijqjlwc createGsonSerializer ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping index b61c400796..82fb8e642c 100644 --- a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping @@ -2,4 +2,3 @@ CLASS net/minecraft/unmapped/C_rakstfzz net/minecraft/loot/provider/nbt/StorageL FIELD f_lmbieoib source Lnet/minecraft/unmapped/C_ncpywfca; METHOD (Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 source - CLASS C_gicwmbjc Serializer diff --git a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping index 437bf8b96d..3c84d75d61 100644 --- a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping @@ -7,4 +7,3 @@ CLASS net/minecraft/unmapped/C_ysseojpb net/minecraft/loot/provider/number/Binom METHOD m_ghlbnwvl create (IF)Lnet/minecraft/unmapped/C_ysseojpb; ARG 0 n ARG 1 p - CLASS C_ygiehsia Serializer diff --git a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping index 38c58e76c0..1b618cfbce 100644 --- a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping @@ -6,5 +6,3 @@ CLASS net/minecraft/unmapped/C_npgjgxqg net/minecraft/loot/provider/number/Const ARG 1 o METHOD m_orxeopbj create (F)Lnet/minecraft/unmapped/C_npgjgxqg; ARG 0 value - CLASS C_cscrawqq Serializer - CLASS C_hxznwzgh CustomSerializer diff --git a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping index e3febfc6b9..bc48e31913 100644 --- a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/unmapped/C_haohozjo net/minecraft/loot/provider/number/LootNumberProviderTypes - METHOD m_duglpyhw register (Ljava/lang/String;Lnet/minecraft/unmapped/C_qdtgrmkp;)Lnet/minecraft/unmapped/C_lsabqekj; + METHOD m_duglpyhw register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_lsabqekj; ARG 0 id - ARG 1 jsonSerializer - METHOD m_tcdaeeam createGsonSerializer ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping index 10d235027f..f15cd75c23 100644 --- a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping @@ -13,4 +13,3 @@ CLASS net/minecraft/unmapped/C_fzpizjul net/minecraft/loot/provider/number/Score METHOD m_vydzinnf create (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;Ljava/lang/String;)Lnet/minecraft/unmapped/C_fzpizjul; ARG 0 target ARG 1 score - CLASS C_cmtvnxel Serializer diff --git a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping index 32e088a5be..3dd337a578 100644 --- a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping @@ -7,4 +7,3 @@ CLASS net/minecraft/unmapped/C_kdnklayn net/minecraft/loot/provider/number/Unifo METHOD m_aswskqij create (FF)Lnet/minecraft/unmapped/C_kdnklayn; ARG 0 min ARG 1 max - CLASS C_emkindtc Serializer diff --git a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping index ae7dafd45f..a30537d2c2 100644 --- a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/unmapped/C_nxgbmgzb net/minecraft/loot/provider/score/Contex ARG 1 target METHOD m_oirvhijv create (Lnet/minecraft/unmapped/C_iakykpgh$C_qtufoufh;)Lnet/minecraft/unmapped/C_bvhqzshp; ARG 0 target - CLASS C_ieguioev Serializer - CLASS C_mxupeodg CustomSerializer diff --git a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping index 9cd7b9d68f..38f5fc9900 100644 --- a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping @@ -4,5 +4,3 @@ CLASS net/minecraft/unmapped/C_vboykgbo net/minecraft/loot/provider/score/FixedL ARG 1 name METHOD m_mkdtzmsi create (Ljava/lang/String;)Lnet/minecraft/unmapped/C_bvhqzshp; ARG 0 name - METHOD m_ytfgzhqh getName ()Ljava/lang/String; - CLASS C_zaamsjvg Serializer diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping index cef639afab..b887bfa33c 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/unmapped/C_smnzfaah net/minecraft/loot/provider/score/LootScoreProviderTypes - METHOD m_bdofream register (Ljava/lang/String;Lnet/minecraft/unmapped/C_qdtgrmkp;)Lnet/minecraft/unmapped/C_bocpfiym; + METHOD m_bdofream register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_bocpfiym; ARG 0 id - ARG 1 jsonSerializer - METHOD m_hwplkirt createGsonSerializer ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 61bf710d7e..5734fdcc48 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -75,7 +75,7 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection METHOD m_egofcujr send (Lnet/minecraft/unmapped/C_zyjtrjrl;)V ARG 1 packet METHOD m_eiltuozj updateStats ()V - METHOD m_ejdecnhl addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;)V + METHOD m_ejdecnhl addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/unmapped/C_exeqxqdd;Lnet/minecraft/unmapped/C_gxhfclcm;)V ARG 0 pipeline ARG 1 side METHOD m_faopouol flushInternal ()V @@ -154,7 +154,7 @@ CLASS net/minecraft/unmapped/C_oasmcckk net/minecraft/network/ClientConnection COMMENT the compression threshold, in number of bytes ARG 2 rejectsBadPackets COMMENT whether this connection may abort if a compressed packet with a bad size is received - METHOD m_vkqagjgi connect (Ljava/net/InetSocketAddress;Z)Lnet/minecraft/unmapped/C_oasmcckk; + METHOD m_vkqagjgi connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/unmapped/C_fnzofwlw;)Lnet/minecraft/unmapped/C_oasmcckk; ARG 0 address ARG 1 useEpoll METHOD m_vyytglie sendInternal (Lnet/minecraft/unmapped/C_zyjtrjrl;Lnet/minecraft/unmapped/C_zddpfpkk;Z)V diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index 3ac65b0840..119ce28322 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -9,10 +9,9 @@ CLASS net/minecraft/unmapped/C_psbzgaqf net/minecraft/network/encryption/PlayerP METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_ixkjimrx createSignatureValidator ()Lnet/minecraft/unmapped/C_yvuwcvkm; - METHOD m_jatolsed createValidated (Lnet/minecraft/unmapped/C_yvuwcvkm;Ljava/util/UUID;Lnet/minecraft/unmapped/C_psbzgaqf$C_aheynfty;Ljava/time/Duration;)Lnet/minecraft/unmapped/C_psbzgaqf; + METHOD m_jatolsed createValidated (Lnet/minecraft/unmapped/C_yvuwcvkm;Ljava/util/UUID;Lnet/minecraft/unmapped/C_psbzgaqf$C_aheynfty;)Lnet/minecraft/unmapped/C_psbzgaqf; ARG 0 signatureValidator ARG 2 data - ARG 3 duration METHOD m_ljjblmai data ()Lnet/minecraft/unmapped/C_psbzgaqf$C_aheynfty; CLASS C_aheynfty Data FIELD f_bmbstads CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/encryption/PublicChatSession.mapping b/mappings/net/minecraft/network/encryption/PublicChatSession.mapping index e4d559b659..84a52c1742 100644 --- a/mappings/net/minecraft/network/encryption/PublicChatSession.mapping +++ b/mappings/net/minecraft/network/encryption/PublicChatSession.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_sdodhjzp net/minecraft/network/encryption/PublicC METHOD m_fnyxsnjf profilePublicKey ()Lnet/minecraft/unmapped/C_psbzgaqf; METHOD m_gabpfnkm serialize ()Lnet/minecraft/unmapped/C_sdodhjzp$C_igdefirc; METHOD m_lbgguqcf sessionId ()Ljava/util/UUID; - METHOD m_lndffmhn createVerifier ()Lnet/minecraft/unmapped/C_kwrnipty; + METHOD m_lndffmhn createVerifier (Ljava/time/Duration;)Lnet/minecraft/unmapped/C_kwrnipty; CLASS C_igdefirc Serialized FIELD f_cjmrjcou profilePublicKey Lnet/minecraft/unmapped/C_psbzgaqf$C_aheynfty; FIELD f_iwjmdtia sessionId Ljava/util/UUID; @@ -21,10 +21,9 @@ CLASS net/minecraft/unmapped/C_sdodhjzp net/minecraft/network/encryption/PublicC METHOD m_jzobioxt write (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_sdodhjzp$C_igdefirc;)V ARG 0 buf ARG 1 chatSession - METHOD m_lmrnnrgs createValidated (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/unmapped/C_yvuwcvkm;Ljava/time/Duration;)Lnet/minecraft/unmapped/C_sdodhjzp; + METHOD m_lmrnnrgs createValidated (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/unmapped/C_yvuwcvkm;)Lnet/minecraft/unmapped/C_sdodhjzp; ARG 1 profile ARG 2 validator - ARG 3 duration METHOD m_uwgoqoeg read (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_sdodhjzp$C_igdefirc; ARG 0 buf METHOD m_yyjjqjwr sessionId ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping index 861da9d553..d5b0749b32 100644 --- a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/unmapped/C_nyzvjqyd net/minecraft/network/listener/ClientQueryPacketListener - METHOD m_guxwkond onPong (Lnet/minecraft/unmapped/C_xkbzyxhs;)V - ARG 1 packet METHOD m_kswawzme onServerMetadata (Lnet/minecraft/unmapped/C_aleeatzq;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping index d1b77fb981..8c9d36dfe7 100644 --- a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/unmapped/C_oiyoogah net/minecraft/network/listener/ServerQueryPacketListener - METHOD m_txqvxtwe onPing (Lnet/minecraft/unmapped/C_oagrpnem;)V - ARG 1 packet METHOD m_ubuewfjp onMetadata (Lnet/minecraft/unmapped/C_ntnrtbrk;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/message/MessageVerifier.mapping b/mappings/net/minecraft/network/message/MessageVerifier.mapping index bd3775ed9a..99bfb8692a 100644 --- a/mappings/net/minecraft/network/message/MessageVerifier.mapping +++ b/mappings/net/minecraft/network/message/MessageVerifier.mapping @@ -11,7 +11,5 @@ CLASS net/minecraft/unmapped/C_kwrnipty net/minecraft/network/message/MessageVer FIELD f_bbvtdfbq lastMessageValidated Z FIELD f_cplsfuqx message Lnet/minecraft/unmapped/C_zzdolisx; FIELD f_tkvgaypi validator Lnet/minecraft/unmapped/C_yvuwcvkm; - METHOD (Lnet/minecraft/unmapped/C_yvuwcvkm;)V - ARG 1 validator METHOD m_vituhgxy validateMessageChain (Lnet/minecraft/unmapped/C_zzdolisx;)Z ARG 1 message diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 1e18ebc110..e58a40e9d5 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,36 +1,22 @@ CLASS net/minecraft/unmapped/C_uuwlfkxz net/minecraft/predicate/BlockPredicate - FIELD f_brljkzff state Lnet/minecraft/unmapped/C_fsjpkzrx; - FIELD f_csfosler blocks Ljava/util/Set; - FIELD f_dwxmerqe tag Lnet/minecraft/unmapped/C_ednuhnnn; - FIELD f_jlmkocct nbt Lnet/minecraft/unmapped/C_emmbeecz; - FIELD f_mtzvotrg ANY Lnet/minecraft/unmapped/C_uuwlfkxz; - METHOD (Lnet/minecraft/unmapped/C_ednuhnnn;Ljava/util/Set;Lnet/minecraft/unmapped/C_fsjpkzrx;Lnet/minecraft/unmapped/C_emmbeecz;)V - ARG 1 tag - ARG 2 blocks - ARG 3 state - ARG 4 nbt - METHOD m_dbgbkkjp toJson ()Lcom/google/gson/JsonElement; + FIELD f_brljkzff state Ljava/util/Optional; + FIELD f_csfosler blocks Ljava/util/Optional; + FIELD f_dwxmerqe tag Ljava/util/Optional; + FIELD f_jlmkocct nbt Ljava/util/Optional; METHOD m_ilwdlmql test (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 1 world ARG 2 pos - METHOD m_jwdzsfkr fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_uuwlfkxz; - ARG 0 json - METHOD m_lsljosms (Lnet/minecraft/unmapped/C_ncpywfca;)Lcom/google/gson/JsonSyntaxException; - ARG 0 id CLASS C_nlqurblw Builder - FIELD f_eyhhpayl blocks Ljava/util/Set; - FIELD f_ibyfhbzu nbt Lnet/minecraft/unmapped/C_emmbeecz; - FIELD f_pqlgfoqx state Lnet/minecraft/unmapped/C_fsjpkzrx; - FIELD f_qdqbvtou tag Lnet/minecraft/unmapped/C_ednuhnnn; - METHOD m_babzacjw blocks (Ljava/lang/Iterable;)Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw; - ARG 1 blocks + FIELD f_eyhhpayl blocks Ljava/util/Optional; + FIELD f_ibyfhbzu nbt Ljava/util/Optional; + FIELD f_pqlgfoqx state Ljava/util/Optional; + FIELD f_qdqbvtou tag Ljava/util/Optional; METHOD m_kvjawvzl blocks ([Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw; ARG 1 blocks METHOD m_lfmbwiwq tag (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw; ARG 1 tag - METHOD m_njukrajf build ()Lnet/minecraft/unmapped/C_uuwlfkxz; + METHOD m_njukrajf build ()Ljava/util/Optional; METHOD m_tcpkqejb create ()Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw; - METHOD m_txboglzz state (Lnet/minecraft/unmapped/C_fsjpkzrx;)Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw; - ARG 1 state + METHOD m_txboglzz state (Lnet/minecraft/unmapped/C_fsjpkzrx$C_wpxfzjkz;)Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw; METHOD m_yjbmvcnd nbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw; ARG 1 nbt diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index 149e70027c..681a4a6ccb 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -1,16 +1,9 @@ CLASS net/minecraft/unmapped/C_mzdoirue net/minecraft/predicate/DamagePredicate FIELD f_gdximifc dealt Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_lsdmsswc ANY Lnet/minecraft/unmapped/C_mzdoirue; - FIELD f_lytxqikq sourceEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_sgomicfi type Lnet/minecraft/unmapped/C_pbkrjvwn; + FIELD f_lytxqikq sourceEntity Ljava/util/Optional; + FIELD f_sgomicfi type Ljava/util/Optional; FIELD f_wyqqlrop taken Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_zfsizhjq blocked Ljava/lang/Boolean; - METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_kvkvpjlm;Ljava/lang/Boolean;Lnet/minecraft/unmapped/C_pbkrjvwn;)V - ARG 1 dealt - ARG 2 taken - ARG 3 sourceEntity - ARG 4 blocked - ARG 5 type + FIELD f_zfsizhjq blocked Ljava/util/Optional; METHOD m_rflgkteu toJson ()Lcom/google/gson/JsonElement; METHOD m_soqfuhzz test (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)Z ARG 1 player @@ -18,13 +11,13 @@ CLASS net/minecraft/unmapped/C_mzdoirue net/minecraft/predicate/DamagePredicate ARG 3 dealt ARG 4 taken ARG 5 blocked - METHOD m_ycystaet fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_mzdoirue; + METHOD m_ycystaet fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json CLASS C_fpwftvxm Builder FIELD f_apbvihdv taken Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_bcwvzvwz sourceEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_hrcobtkv type Lnet/minecraft/unmapped/C_pbkrjvwn; - FIELD f_mekktmri blocked Ljava/lang/Boolean; + FIELD f_bcwvzvwz sourceEntity Ljava/util/Optional; + FIELD f_hrcobtkv type Ljava/util/Optional; + FIELD f_mekktmri blocked Ljava/util/Optional; FIELD f_qjhcopfu dealt Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; METHOD m_ackbdbkr taken (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm; ARG 1 taken @@ -37,6 +30,6 @@ CLASS net/minecraft/unmapped/C_mzdoirue net/minecraft/predicate/DamagePredicate METHOD m_mywnaedq create ()Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm; METHOD m_tzafezrf dealt (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm; ARG 1 dealt - METHOD m_vvqyaukm build ()Lnet/minecraft/unmapped/C_mzdoirue; + METHOD m_vvqyaukm build ()Ljava/util/Optional; METHOD m_wqdxjign blocked (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm; ARG 1 blocked diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index dcda1ed8c3..e942fa49de 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -1,25 +1,17 @@ CLASS net/minecraft/unmapped/C_fjarvlro net/minecraft/predicate/FluidPredicate - FIELD f_btymiokj ANY Lnet/minecraft/unmapped/C_fjarvlro; - FIELD f_dcnttrqi fluid Lnet/minecraft/unmapped/C_rxhyurmy; - FIELD f_lxdknjch tag Lnet/minecraft/unmapped/C_ednuhnnn; - FIELD f_zkzipyxa state Lnet/minecraft/unmapped/C_fsjpkzrx; - METHOD (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_rxhyurmy;Lnet/minecraft/unmapped/C_fsjpkzrx;)V - ARG 1 tag - ARG 2 fluid - ARG 3 state - METHOD m_kgnrnmsm toJson ()Lcom/google/gson/JsonElement; - METHOD m_sbmxxzrc fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_fjarvlro; - ARG 0 json + FIELD f_dcnttrqi fluid Ljava/util/Optional; + FIELD f_lxdknjch tag Ljava/util/Optional; + FIELD f_zkzipyxa state Ljava/util/Optional; METHOD m_wkvtvksc test (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 1 world ARG 2 pos CLASS C_ahtnwewe Builder - FIELD f_jiudtuyd fluid Lnet/minecraft/unmapped/C_rxhyurmy; - FIELD f_nrkjbcog state Lnet/minecraft/unmapped/C_fsjpkzrx; - FIELD f_wshytdsz tag Lnet/minecraft/unmapped/C_ednuhnnn; + FIELD f_jiudtuyd fluid Ljava/util/Optional; + FIELD f_nrkjbcog state Ljava/util/Optional; + FIELD f_wshytdsz tag Ljava/util/Optional; METHOD m_bphxxxwm fluid (Lnet/minecraft/unmapped/C_rxhyurmy;)Lnet/minecraft/unmapped/C_fjarvlro$C_ahtnwewe; ARG 1 fluid - METHOD m_gzaoshuf build ()Lnet/minecraft/unmapped/C_fjarvlro; + METHOD m_gzaoshuf build ()Ljava/util/Optional; METHOD m_laxpsmjc state (Lnet/minecraft/unmapped/C_fsjpkzrx;)Lnet/minecraft/unmapped/C_fjarvlro$C_ahtnwewe; ARG 1 state METHOD m_xerrxnnf create ()Lnet/minecraft/unmapped/C_fjarvlro$C_ahtnwewe; diff --git a/mappings/net/minecraft/predicate/LightPredicate.mapping b/mappings/net/minecraft/predicate/LightPredicate.mapping index 9fc64da162..386699fb89 100644 --- a/mappings/net/minecraft/predicate/LightPredicate.mapping +++ b/mappings/net/minecraft/predicate/LightPredicate.mapping @@ -1,17 +1,13 @@ CLASS net/minecraft/unmapped/C_ammgthmo net/minecraft/predicate/LightPredicate FIELD f_gwjdidho range Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_smjvcbjc ANY Lnet/minecraft/unmapped/C_ammgthmo; METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V ARG 1 range - METHOD m_uqacddki fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_ammgthmo; - ARG 0 json METHOD m_zrsyuupr test (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z ARG 1 world ARG 2 pos - METHOD m_zusoqkrl toJson ()Lcom/google/gson/JsonElement; CLASS C_kadjxsdu Builder FIELD f_qdfqqvzg light Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; METHOD m_kwxblsoh create ()Lnet/minecraft/unmapped/C_ammgthmo$C_kadjxsdu; - METHOD m_qacvspmk build ()Lnet/minecraft/unmapped/C_ammgthmo; + METHOD m_qacvspmk build ()Ljava/util/Optional; METHOD m_zrzbmtiy light (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_ammgthmo$C_kadjxsdu; ARG 1 light diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index 3c2cf2e7f2..cef6a2f65f 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/unmapped/C_emmbeecz net/minecraft/predicate/NbtPredicate - FIELD f_iwksmfra ANY Lnet/minecraft/unmapped/C_emmbeecz; FIELD f_jiddzkdc nbt Lnet/minecraft/unmapped/C_hhlwcnih; METHOD (Lnet/minecraft/unmapped/C_hhlwcnih;)V ARG 1 nbt - METHOD m_coismdbv toJson ()Lcom/google/gson/JsonElement; METHOD m_ebfqevpx entityToNbt (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_hhlwcnih; ARG 0 entity METHOD m_mcpixnfw test (Lnet/minecraft/unmapped/C_sddaxwyk;)Z @@ -12,5 +10,3 @@ CLASS net/minecraft/unmapped/C_emmbeecz net/minecraft/predicate/NbtPredicate ARG 1 entity METHOD m_rsstddzc test (Lnet/minecraft/unmapped/C_oivssbvb;)Z ARG 1 nbt - METHOD m_unmamaql fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_emmbeecz; - ARG 0 json diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index b7dfc7723a..cb07d3a912 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -1,46 +1,23 @@ CLASS net/minecraft/unmapped/C_nihhkamy net/minecraft/predicate/NumberRange FIELD f_cfxpiscn EXCEPTION_EMPTY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD f_mhlbxidk min Ljava/lang/Number; FIELD f_ryyerrzl EXCEPTION_SWAPPED Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD f_shapysgh max Ljava/lang/Number; - METHOD (Ljava/lang/Number;Ljava/lang/Number;)V - ARG 1 min - ARG 2 max - METHOD m_fcgaoyqo getMax ()Ljava/lang/Number; - METHOD m_itcosxqx toJson ()Lcom/google/gson/JsonElement; - METHOD m_iydfquwm map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - ARG 0 object - ARG 1 function METHOD m_ltinwfvw parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_nihhkamy$C_jreuzyex;Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_nihhkamy; ARG 0 commandReader ARG 2 converter ARG 3 exceptionTypeSupplier ARG 4 mapper - METHOD m_oimibvqv fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Number; + METHOD m_oimibvqv fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/util/Optional; ARG 0 reader ARG 1 converter ARG 2 exceptionTypeSupplier METHOD m_ttzchrrm isDummy ()Z METHOD m_xpcbxkqc isNextCharValid (Lcom/mojang/brigadier/StringReader;)Z ARG 0 reader - METHOD m_zapppodc getMin ()Ljava/lang/Number; - METHOD m_zwzjvmmh fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/unmapped/C_nihhkamy;Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_nihhkamy$C_nfiuvfys;)Lnet/minecraft/unmapped/C_nihhkamy; - ARG 0 json - ARG 1 fallback - ARG 2 asNumber - ARG 3 factory CLASS C_jreuzyex CommandFactory - METHOD create create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/unmapped/C_nihhkamy; - ARG 1 reader - ARG 2 min - ARG 3 max CLASS C_mujuochb IntRange - FIELD f_bgngiydc maxSquared Ljava/lang/Long; - FIELD f_fciapavv minSquared Ljava/lang/Long; + FIELD f_bgngiydc maxSquared Ljava/util/Optional; + FIELD f_fciapavv minSquared Ljava/util/Optional; FIELD f_lqncxgvg ANY Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 1 min - ARG 2 max 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 @@ -53,40 +30,28 @@ CLASS net/minecraft/unmapped/C_nihhkamy net/minecraft/predicate/NumberRange ARG 0 value METHOD m_sztoqtmf parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; ARG 0 reader - METHOD m_tvuukdtv squared (Ljava/lang/Integer;)Ljava/lang/Long; - ARG 0 value + METHOD m_tvuukdtv squared (Ljava/util/Optional;)Ljava/util/Optional; METHOD m_urmdctrd test (I)Z ARG 1 value - METHOD m_zaacvmhk parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; + METHOD m_zaacvmhk parse (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; ARG 0 reader - ARG 1 min - ARG 2 max METHOD m_zfjxrqdp atLeast (I)Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; ARG 0 value METHOD m_zhpgzufj exactly (I)Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; ARG 0 value CLASS C_nfiuvfys Factory - METHOD create create (Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/unmapped/C_nihhkamy; - ARG 1 min - ARG 2 max CLASS C_qatgyzfn FloatRange - FIELD f_jwxokqnq squaredMin Ljava/lang/Double; + FIELD f_jwxokqnq squaredMin Ljava/util/Optional; FIELD f_oydeehsg ANY Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_viflunmo squaredMax Ljava/lang/Double; - METHOD (Ljava/lang/Double;Ljava/lang/Double;)V - ARG 1 min - ARG 2 max - METHOD m_fyonzumn square (Ljava/lang/Double;)Ljava/lang/Double; - ARG 0 value + FIELD f_viflunmo squaredMax Ljava/util/Optional; + METHOD m_fyonzumn square (Ljava/util/Optional;)Ljava/util/Optional; METHOD m_giijxnoj parse (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; ARG 0 reader ARG 1 mapper METHOD m_gyocfnro atMost (D)Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; ARG 0 value - METHOD m_keoxrhbh create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Double;Ljava/lang/Double;)Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; + METHOD m_keoxrhbh create (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; ARG 0 reader - ARG 1 min - ARG 2 max METHOD m_lrhuesqv test (D)Z ARG 1 value METHOD m_sphipens parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; diff --git a/mappings/net/minecraft/predicate/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/PlayerPredicate.mapping index 45d4f651a7..5a20002e70 100644 --- a/mappings/net/minecraft/predicate/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/PlayerPredicate.mapping @@ -1,25 +1,10 @@ CLASS net/minecraft/unmapped/C_hirptovz net/minecraft/predicate/PlayerPredicate FIELD f_biwhdxrw recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; - FIELD f_fimlronk gameMode Lnet/minecraft/unmapped/C_lghcpyvl; + FIELD f_fimlronk gameMode Ljava/util/Optional; FIELD f_mxmwuhmx advancements Ljava/util/Map; FIELD f_vmcukqfg experienceLevel Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_vxsybuyy stats Ljava/util/Map; - FIELD f_xyxtwmws lookingAt Lnet/minecraft/unmapped/C_kvkvpjlm; - METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_lghcpyvl;Ljava/util/Map;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;Lnet/minecraft/unmapped/C_kvkvpjlm;)V - ARG 1 experienceLevel - ARG 2 gameMode - ARG 3 stats - ARG 4 recipes - ARG 5 advancements - ARG 6 lookingAt - METHOD m_kgumsxzr fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_hirptovz; - METHOD m_rclduwpi getStat (Lnet/minecraft/unmapped/C_qwzfcpmd;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_sibrxbfy; - ARG 0 type - ARG 1 id - METHOD m_sgvxlyqh getStatId (Lnet/minecraft/unmapped/C_sibrxbfy;)Lnet/minecraft/unmapped/C_ncpywfca; - ARG 0 stat - METHOD m_xprxesio criterionFromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_hirptovz$C_cegktaty; - ARG 0 json + FIELD f_vxsybuyy stats Ljava/util/List; + FIELD f_xyxtwmws lookingAt Ljava/util/Optional; CLASS C_bosmcbsg CompletedAdvancementPredicate FIELD f_ixbokelm done Z METHOD (Z)V @@ -27,19 +12,16 @@ CLASS net/minecraft/unmapped/C_hirptovz net/minecraft/predicate/PlayerPredicate METHOD test (Ljava/lang/Object;)Z ARG 1 progress CLASS C_cegktaty AdvancementPredicate - METHOD m_hspkcwnd toJson ()Lcom/google/gson/JsonElement; CLASS C_veyywklk Builder - FIELD f_gtdcqxly gameMode Lnet/minecraft/unmapped/C_lghcpyvl; + FIELD f_gtdcqxly gameMode Ljava/util/Optional; FIELD f_kdoddpht advancements Ljava/util/Map; FIELD f_lkpiqnrw experienceLevel Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_nyobdzin stats Ljava/util/Map; + FIELD f_nyobdzin stats Lcom/google/common/collect/ImmutableList$Builder; FIELD f_pgauqijp recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; - FIELD f_rvsgabdi lookingAt Lnet/minecraft/unmapped/C_kvkvpjlm; - METHOD m_dxuypdjk lookingAt (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_hirptovz$C_veyywklk; - ARG 1 lookingAt - METHOD m_fdtneroe stat (Lnet/minecraft/unmapped/C_sibrxbfy;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_hirptovz$C_veyywklk; - ARG 1 stat - ARG 2 value + FIELD f_rvsgabdi lookingAt Ljava/util/Optional; + METHOD m_dxuypdjk lookingAt (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_hirptovz$C_veyywklk; + METHOD m_fdtneroe stat (Lnet/minecraft/unmapped/C_qwzfcpmd;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_hirptovz$C_veyywklk; + ARG 3 value METHOD m_fvsyfktx advancement (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;)Lnet/minecraft/unmapped/C_hirptovz$C_veyywklk; ARG 1 id ARG 2 criteria diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index 0b7a45f27f..c1e45084f9 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -1,55 +1,21 @@ CLASS net/minecraft/unmapped/C_fsjpkzrx net/minecraft/predicate/StatePredicate - FIELD f_aqxoyuhl ANY Lnet/minecraft/unmapped/C_fsjpkzrx; FIELD f_toxaaook conditions Ljava/util/List; METHOD (Ljava/util/List;)V ARG 1 conditions METHOD m_bbmuquuo test (Lnet/minecraft/unmapped/C_ezfeikaq;Lnet/minecraft/unmapped/C_jccsnmmo;)Z ARG 1 stateManager ARG 2 container - METHOD m_flzybrzb check (Lnet/minecraft/unmapped/C_ezfeikaq;Ljava/util/function/Consumer;)V - ARG 1 factory - ARG 2 reporter METHOD m_gmelzunj test (Lnet/minecraft/unmapped/C_xqketiuf;)Z ARG 1 state METHOD m_igwihkjs test (Lnet/minecraft/unmapped/C_txtbiemp;)Z ARG 1 state - METHOD m_lifzgxxa fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_fsjpkzrx; - ARG 0 json - METHOD m_uhpcytas asNullableString (Lcom/google/gson/JsonElement;)Ljava/lang/String; - ARG 0 json - METHOD m_xyqawups createPredicate (Ljava/lang/String;Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_fsjpkzrx$C_tmunpmxs; - ARG 0 key - ARG 1 json METHOD m_zwylrnam toJson ()Lcom/google/gson/JsonElement; - CLASS C_fqwttbgt ExactValueCondition - FIELD f_tuvodrpw value Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;)V - ARG 1 key - ARG 2 value CLASS C_tmunpmxs Condition FIELD f_rqaysqvr key Ljava/lang/String; - METHOD (Ljava/lang/String;)V - ARG 1 key - METHOD m_bgzcwfmt reportMissing (Lnet/minecraft/unmapped/C_ezfeikaq;Ljava/util/function/Consumer;)V + METHOD m_bgzcwfmt reportMissing (Lnet/minecraft/unmapped/C_ezfeikaq;)Ljava/util/Optional; ARG 1 factory - ARG 2 reporter - METHOD m_brlhvgoq toJson ()Lcom/google/gson/JsonElement; - METHOD m_ticfzhtb test (Lnet/minecraft/unmapped/C_jccsnmmo;Lnet/minecraft/unmapped/C_vzlztuyw;)Z - ARG 1 state - ARG 2 property - METHOD m_tzdsbnaa getKey ()Ljava/lang/String; - METHOD m_yzmucski test (Lnet/minecraft/unmapped/C_ezfeikaq;Lnet/minecraft/unmapped/C_jccsnmmo;)Z - ARG 1 stateManager - ARG 2 state - CLASS C_wcskuoqr RangedValueCondition - FIELD f_qxtrbabt min Ljava/lang/String; - FIELD f_uzwwclxq max Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 key - ARG 2 min - ARG 3 max CLASS C_wpxfzjkz Builder - FIELD f_ooulyvzv conditions Ljava/util/List; + FIELD f_ooulyvzv conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD m_enqclpth exactMatch (Lnet/minecraft/unmapped/C_vzlztuyw;Ljava/lang/String;)Lnet/minecraft/unmapped/C_fsjpkzrx$C_wpxfzjkz; ARG 1 property ARG 2 valueName @@ -63,4 +29,4 @@ CLASS net/minecraft/unmapped/C_fsjpkzrx net/minecraft/predicate/StatePredicate METHOD m_pkmnwskx exactMatch (Lnet/minecraft/unmapped/C_vzlztuyw;Z)Lnet/minecraft/unmapped/C_fsjpkzrx$C_wpxfzjkz; ARG 1 property ARG 2 value - METHOD m_zuubmyma build ()Lnet/minecraft/unmapped/C_fsjpkzrx; + METHOD m_zuubmyma build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/TagPredicate.mapping b/mappings/net/minecraft/predicate/TagPredicate.mapping index f13d893466..1b6d9ab214 100644 --- a/mappings/net/minecraft/predicate/TagPredicate.mapping +++ b/mappings/net/minecraft/predicate/TagPredicate.mapping @@ -6,10 +6,7 @@ CLASS net/minecraft/unmapped/C_jocdhano net/minecraft/predicate/TagPredicate ARG 2 expected METHOD m_ivqgtbrm test (Lnet/minecraft/unmapped/C_cjzoxshv;)Z ARG 1 holder - METHOD m_lkgtrvua fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_jocdhano; - ARG 0 json METHOD m_qzjfdokv unexpected (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_jocdhano; ARG 0 tagKey - METHOD m_ynuzucuq toJson ()Lcom/google/gson/JsonElement; METHOD m_zwaaudhq expected (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_jocdhano; ARG 0 tagKey diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping index e320d97e7d..a84d9d84ba 100644 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/unmapped/C_gzewtdot net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer FIELD f_izykunnd advancementId Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_jcdpabyl LOGGER Lorg/slf4j/Logger; - FIELD f_qxvoghfr gson Lcom/google/gson/Gson; - METHOD m_aisqmgwa loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/unmapped/C_vczsvjil;)[Lnet/minecraft/unmapped/C_vqkczpuv; + METHOD m_aisqmgwa loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/unmapped/C_vczsvjil;)Ljava/util/List; ARG 1 array ARG 2 key ARG 3 contextType diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping deleted file mode 100644 index 9ab2febedd..0000000000 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/unmapped/C_cogtomcl net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer - FIELD f_hhxrfays INSTANCE Lnet/minecraft/unmapped/C_cogtomcl; - FIELD f_jzcyzoqi gson Lcom/google/gson/Gson; - METHOD m_nvmmqqby conditionsToJson ([Lnet/minecraft/unmapped/C_vqkczpuv;)Lcom/google/gson/JsonElement; - ARG 1 conditions diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index 41db8cf167..2cc16aa032 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/unmapped/C_pbkrjvwn net/minecraft/predicate/entity/DamageSourcePredicate - FIELD f_bwswqydl sourceEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_lmuwnwvu directEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_rkqropja EMPTY Lnet/minecraft/unmapped/C_pbkrjvwn; + FIELD f_bwswqydl sourceEntity Ljava/util/Optional; + FIELD f_lmuwnwvu directEntity Ljava/util/Optional; METHOD m_drhwrtau toJson ()Lcom/google/gson/JsonElement; METHOD m_ppkkwrwq test (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z ARG 1 world @@ -10,18 +9,10 @@ CLASS net/minecraft/unmapped/C_pbkrjvwn net/minecraft/predicate/entity/DamageSou METHOD m_tupxouxz test (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z ARG 1 player ARG 2 damageSource - METHOD m_zlvpdvpu fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_pbkrjvwn; + METHOD m_zlvpdvpu fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json CLASS C_kyhcyyna Builder - FIELD f_axbrhphp directEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_genmlbwv sourceEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - METHOD m_dffyjuvg directEntity (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna; - ARG 1 entity - METHOD m_mcxfwnfm directEntity (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna; - ARG 1 entity + FIELD f_axbrhphp directEntity Ljava/util/Optional; + FIELD f_genmlbwv sourceEntity Ljava/util/Optional; METHOD m_stckqjkt create ()Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna; - METHOD m_vxkdhikg sourceEntity (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna; - ARG 1 entity - METHOD m_zejgtaud sourceEntity (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_pbkrjvwn$C_kyhcyyna; - ARG 1 entity - METHOD m_zpnasdcw build ()Lnet/minecraft/unmapped/C_pbkrjvwn; + METHOD m_zpnasdcw build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping index 7548ea32f4..68eda1eaac 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/unmapped/C_ullximxc net/minecraft/predicate/entity/DistanceP FIELD f_emnlepgu absolute Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; FIELD f_hgkosnat y Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; FIELD f_lpyysibb z Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_tepcoprf ANY Lnet/minecraft/unmapped/C_ullximxc; FIELD f_xhxgxmyc x Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)V ARG 1 x @@ -11,11 +10,7 @@ CLASS net/minecraft/unmapped/C_ullximxc net/minecraft/predicate/entity/DistanceP ARG 3 z ARG 4 horizontal ARG 5 absolute - METHOD m_fwxmanou horizontal (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ullximxc; - ARG 0 horizontal METHOD m_gmxsatio toJson ()Lcom/google/gson/JsonElement; - METHOD m_mlvwkkeg absolute (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ullximxc; - ARG 0 absolute METHOD m_qkderagl test (DDDDDD)Z ARG 1 x0 ARG 3 y0 @@ -23,7 +18,7 @@ CLASS net/minecraft/unmapped/C_ullximxc net/minecraft/predicate/entity/DistanceP ARG 7 x1 ARG 9 y1 ARG 11 z1 - METHOD m_vxrhdsyh fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_ullximxc; + METHOD m_vxrhdsyh fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD m_zdiatetf y (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ullximxc; ARG 0 y diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index e59436bdc4..f12e524138 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -1,35 +1,19 @@ CLASS net/minecraft/unmapped/C_nysuqcvh net/minecraft/predicate/entity/EntityEffectPredicate - FIELD f_lblmrhgc effects Ljava/util/Map; - FIELD f_nbqgxsme EMPTY Lnet/minecraft/unmapped/C_nysuqcvh; METHOD (Ljava/util/Map;)V ARG 1 effects METHOD m_aamynkno toJson ()Lcom/google/gson/JsonElement; - METHOD m_omydqhvq withEffect (Lnet/minecraft/unmapped/C_jaqasomh;)Lnet/minecraft/unmapped/C_nysuqcvh; - ARG 1 statusEffect METHOD m_ugbmifay test (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity - METHOD m_voerbvla create ()Lnet/minecraft/unmapped/C_nysuqcvh; METHOD m_wtwqrnjs test (Ljava/util/Map;)Z ARG 1 effects - METHOD m_xxlrorgp withEffect (Lnet/minecraft/unmapped/C_jaqasomh;Lnet/minecraft/unmapped/C_nysuqcvh$C_qvelrybl;)Lnet/minecraft/unmapped/C_nysuqcvh; - ARG 1 statusEffect - ARG 2 data - METHOD m_ymmncaao fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_nysuqcvh; + METHOD m_ymmncaao fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD m_ztsrmcao test (Lnet/minecraft/unmapped/C_usxaxydn;)Z ARG 1 livingEntity CLASS C_qvelrybl EffectData FIELD f_drzkfcrl duration Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_kqyufijy ambient Ljava/lang/Boolean; - FIELD f_qzpdylyx visible Ljava/lang/Boolean; + FIELD f_kqyufijy ambient Ljava/util/Optional; + FIELD f_qzpdylyx visible Ljava/util/Optional; FIELD f_syqzvsja amplifier Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 amplifier - ARG 2 duration - ARG 3 ambient - ARG 4 visible - METHOD m_fbbyqxic fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_nysuqcvh$C_qvelrybl; - ARG 0 json METHOD m_iwzawukj test (Lnet/minecraft/unmapped/C_wpfizwve;)Z ARG 1 statusEffectInstance - METHOD m_qysfcdfp toJson ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index 619e8fd692..5674e5e41f 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -1,42 +1,25 @@ CLASS net/minecraft/unmapped/C_pcnmkxrp net/minecraft/predicate/entity/EntityEquipmentPredicate - FIELD f_bgamytoz chest Lnet/minecraft/unmapped/C_afravpde; + FIELD f_bgamytoz chest Ljava/util/Optional; FIELD f_bpigxfen OMINOUS_BANNER_ON_HEAD Lnet/minecraft/unmapped/C_pcnmkxrp; - FIELD f_buojddwn head Lnet/minecraft/unmapped/C_afravpde; - FIELD f_cwkllonr feet Lnet/minecraft/unmapped/C_afravpde; - FIELD f_herbpucu mainhand Lnet/minecraft/unmapped/C_afravpde; - FIELD f_jrjlkbbz offhand Lnet/minecraft/unmapped/C_afravpde; - FIELD f_sxgotnqa ANY Lnet/minecraft/unmapped/C_pcnmkxrp; - FIELD f_tmvrabjw legs Lnet/minecraft/unmapped/C_afravpde; - METHOD (Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_afravpde;Lnet/minecraft/unmapped/C_afravpde;)V - ARG 1 head - ARG 2 chest - ARG 3 legs - ARG 4 feet - ARG 5 mainhand - ARG 6 offhand + FIELD f_buojddwn head Ljava/util/Optional; + FIELD f_cwkllonr feet Ljava/util/Optional; + FIELD f_herbpucu mainhand Ljava/util/Optional; + FIELD f_jrjlkbbz offhand Ljava/util/Optional; + FIELD f_tmvrabjw legs Ljava/util/Optional; METHOD m_dequfqxd test (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity - METHOD m_rmweuqpk toJson ()Lcom/google/gson/JsonElement; - METHOD m_uaiymvbm fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_pcnmkxrp; - ARG 0 json CLASS C_artofvmh Builder - FIELD f_ezcntgxa feet Lnet/minecraft/unmapped/C_afravpde; - FIELD f_iwfcobsg offhand Lnet/minecraft/unmapped/C_afravpde; - FIELD f_kfyxfhcg legs Lnet/minecraft/unmapped/C_afravpde; - FIELD f_pjxubwqt head Lnet/minecraft/unmapped/C_afravpde; - FIELD f_vajemrvr chest Lnet/minecraft/unmapped/C_afravpde; - FIELD f_zrmhhqda mainhand Lnet/minecraft/unmapped/C_afravpde; - METHOD m_bkzabdju legs (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; - ARG 1 legs - METHOD m_dhxysdaz chest (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; - ARG 1 chest - METHOD m_oqdbzokh mainhand (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; - ARG 1 mainhand - METHOD m_vdnqbady build ()Lnet/minecraft/unmapped/C_pcnmkxrp; - METHOD m_wlcmwzkp offhand (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; - ARG 1 offhand - METHOD m_wxchvxyp feet (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; - ARG 1 feet - METHOD m_xnntkcor head (Lnet/minecraft/unmapped/C_afravpde;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; - ARG 1 head + FIELD f_ezcntgxa feet Ljava/util/Optional; + FIELD f_iwfcobsg offhand Ljava/util/Optional; + FIELD f_kfyxfhcg legs Ljava/util/Optional; + FIELD f_pjxubwqt head Ljava/util/Optional; + FIELD f_vajemrvr chest Ljava/util/Optional; + FIELD f_zrmhhqda mainhand Ljava/util/Optional; + METHOD m_bkzabdju legs (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; + METHOD m_dhxysdaz chest (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; + METHOD m_oqdbzokh mainhand (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; + METHOD m_vdnqbady build ()Ljava/util/Optional; + METHOD m_wlcmwzkp offhand (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; + METHOD m_wxchvxyp feet (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; + METHOD m_xnntkcor head (Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk;)Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; METHOD m_yippsqrh create ()Lnet/minecraft/unmapped/C_pcnmkxrp$C_artofvmh; diff --git a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping index 930d5dc51a..fca06ad3a8 100644 --- a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping @@ -1,34 +1,17 @@ CLASS net/minecraft/unmapped/C_rptqszvm net/minecraft/predicate/entity/EntityFlagsPredicate - FIELD f_bqjxtggd ANY Lnet/minecraft/unmapped/C_rptqszvm; - FIELD f_dvtqvaqp isBaby Ljava/lang/Boolean; - FIELD f_oabbppwt isSneaking Ljava/lang/Boolean; - FIELD f_pjiaftkp isSprinting Ljava/lang/Boolean; - FIELD f_qhpucciz isOnFire Ljava/lang/Boolean; - FIELD f_rjajjbpg isSwimming Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 isOnFire - ARG 2 isSneaking - ARG 3 isSprinting - ARG 4 isSwimming - ARG 5 isBaby + FIELD f_dvtqvaqp isBaby Ljava/util/Optional; + FIELD f_oabbppwt isSneaking Ljava/util/Optional; + FIELD f_pjiaftkp isSprinting Ljava/util/Optional; + FIELD f_qhpucciz isOnFire Ljava/util/Optional; + FIELD f_rjajjbpg isSwimming Ljava/util/Optional; METHOD m_gnvichmm test (Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 entity - METHOD m_hltxhqdr fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_rptqszvm; - ARG 0 json - METHOD m_kpectnti nullableBooleanFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; - ARG 0 json - ARG 1 key - METHOD m_rucpejii nullableBooleanToJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Boolean;)V - ARG 1 json - ARG 2 key - ARG 3 value - METHOD m_sojobkba toJson ()Lcom/google/gson/JsonElement; CLASS C_nbivukxv Builder - FIELD f_cmmfyjxh isBaby Ljava/lang/Boolean; - FIELD f_haowgryx isOnFire Ljava/lang/Boolean; - FIELD f_tqsbstcy isSprinting Ljava/lang/Boolean; - FIELD f_vzvpnxlo isSwimming Ljava/lang/Boolean; - FIELD f_yepvgtnz isSneaking Ljava/lang/Boolean; + FIELD f_cmmfyjxh isBaby Ljava/util/Optional; + FIELD f_haowgryx isOnFire Ljava/util/Optional; + FIELD f_tqsbstcy isSprinting Ljava/util/Optional; + FIELD f_vzvpnxlo isSwimming Ljava/util/Optional; + FIELD f_yepvgtnz isSneaking Ljava/util/Optional; METHOD m_fdzsalho swimming (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_rptqszvm$C_nbivukxv; ARG 1 swimming METHOD m_mqguilug sneaking (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_rptqszvm$C_nbivukxv; @@ -38,6 +21,6 @@ CLASS net/minecraft/unmapped/C_rptqszvm net/minecraft/predicate/entity/EntityFla ARG 1 onFire METHOD m_vfrpjnxb sprinting (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_rptqszvm$C_nbivukxv; ARG 1 sprinting - METHOD m_xmzsgjti build ()Lnet/minecraft/unmapped/C_rptqszvm; + METHOD m_xmzsgjti build ()Ljava/util/Optional; METHOD m_yhlhwplv isBaby (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_rptqszvm$C_nbivukxv; ARG 1 isBaby diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index e46c41a10a..4cb480d894 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -1,43 +1,17 @@ CLASS net/minecraft/unmapped/C_kvkvpjlm net/minecraft/predicate/entity/EntityPredicate - FIELD f_bysanlre nbt Lnet/minecraft/unmapped/C_emmbeecz; - FIELD f_eieyszej location Lnet/minecraft/unmapped/C_ypvebgnl; - FIELD f_ggbragpd targetedEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_hameugqn ANY Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_ifyilwup passenger Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_lmuipoqi steppingOn Lnet/minecraft/unmapped/C_ypvebgnl; - FIELD f_mxeamups team Ljava/lang/String; - FIELD f_niwouezd typeSpecific Lnet/minecraft/unmapped/C_ljtxhtrw; - FIELD f_osweyokb flags Lnet/minecraft/unmapped/C_rptqszvm; - FIELD f_scvxyefk effects Lnet/minecraft/unmapped/C_nysuqcvh; - FIELD f_tptkhefk distance Lnet/minecraft/unmapped/C_ullximxc; - FIELD f_xozemqxy type Lnet/minecraft/unmapped/C_wrnalooj; - FIELD f_ycxvlbvr equipment Lnet/minecraft/unmapped/C_pcnmkxrp; - FIELD f_yvrkjogt vehicle Lnet/minecraft/unmapped/C_kvkvpjlm; - METHOD (Lnet/minecraft/unmapped/C_wrnalooj;Lnet/minecraft/unmapped/C_ullximxc;Lnet/minecraft/unmapped/C_ypvebgnl;Lnet/minecraft/unmapped/C_ypvebgnl;Lnet/minecraft/unmapped/C_nysuqcvh;Lnet/minecraft/unmapped/C_emmbeecz;Lnet/minecraft/unmapped/C_rptqszvm;Lnet/minecraft/unmapped/C_pcnmkxrp;Lnet/minecraft/unmapped/C_ljtxhtrw;Ljava/lang/String;)V - ARG 1 type - ARG 2 distance - ARG 3 location - ARG 4 steppingOn - ARG 5 effects - ARG 6 nbt - ARG 7 flags - ARG 8 equipment - ARG 9 typeSpecific - ARG 10 team - METHOD (Lnet/minecraft/unmapped/C_wrnalooj;Lnet/minecraft/unmapped/C_ullximxc;Lnet/minecraft/unmapped/C_ypvebgnl;Lnet/minecraft/unmapped/C_ypvebgnl;Lnet/minecraft/unmapped/C_nysuqcvh;Lnet/minecraft/unmapped/C_emmbeecz;Lnet/minecraft/unmapped/C_rptqszvm;Lnet/minecraft/unmapped/C_pcnmkxrp;Lnet/minecraft/unmapped/C_ljtxhtrw;Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_kvkvpjlm;Lnet/minecraft/unmapped/C_kvkvpjlm;Ljava/lang/String;)V - ARG 1 type - ARG 2 distance - ARG 3 location - ARG 4 steppingOn - ARG 5 effects - ARG 6 nbt - ARG 7 flags - ARG 8 equipment - ARG 9 typeSpecific - ARG 10 vehicle - ARG 11 passenger - ARG 12 targetedEntity - ARG 13 team + FIELD f_bysanlre nbt Ljava/util/Optional; + FIELD f_eieyszej location Ljava/util/Optional; + FIELD f_ggbragpd targetedEntity Ljava/util/Optional; + FIELD f_ifyilwup passenger Ljava/util/Optional; + FIELD f_lmuipoqi steppingOn Ljava/util/Optional; + FIELD f_mxeamups team Ljava/util/Optional; + FIELD f_niwouezd typeSpecific Ljava/util/Optional; + FIELD f_osweyokb flags Ljava/util/Optional; + FIELD f_scvxyefk effects Ljava/util/Optional; + FIELD f_tptkhefk distance Ljava/util/Optional; + FIELD f_xozemqxy type Ljava/util/Optional; + FIELD f_ycxvlbvr equipment Ljava/util/Optional; + FIELD f_yvrkjogt vehicle Ljava/util/Optional; METHOD m_cviarbxt toJson ()Lcom/google/gson/JsonElement; METHOD m_npdomabq test (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;)Z ARG 1 world @@ -50,48 +24,39 @@ CLASS net/minecraft/unmapped/C_kvkvpjlm net/minecraft/predicate/entity/EntityPre ARG 1 player ARG 2 entity CLASS C_fnhnavbg Builder - FIELD f_adlgaflf targetedEntity Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_agfbxblt distance Lnet/minecraft/unmapped/C_ullximxc; - FIELD f_amfaafhn equipment Lnet/minecraft/unmapped/C_pcnmkxrp; - FIELD f_jhxzkssw vehicle Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_jnmwkhde team Ljava/lang/String; - FIELD f_pucztlsm effects Lnet/minecraft/unmapped/C_nysuqcvh; - FIELD f_qeendvut steppingOn Lnet/minecraft/unmapped/C_ypvebgnl; - FIELD f_qfcgduht passenger Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_qfiiycir type Lnet/minecraft/unmapped/C_wrnalooj; - FIELD f_rzqpiapu nbt Lnet/minecraft/unmapped/C_emmbeecz; - FIELD f_tjhcdgoz location Lnet/minecraft/unmapped/C_ypvebgnl; - FIELD f_upesirxb flags Lnet/minecraft/unmapped/C_rptqszvm; - FIELD f_xwwrgnab typeSpecific Lnet/minecraft/unmapped/C_ljtxhtrw; - METHOD m_bojkbcmy 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;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; - ARG 1 vehicle - METHOD m_dxowdvhv targetedEntity (Lnet/minecraft/unmapped/C_kvkvpjlm;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; - ARG 1 targetedEntity + FIELD f_adlgaflf targetedEntity Ljava/util/Optional; + FIELD f_agfbxblt distance Ljava/util/Optional; + FIELD f_amfaafhn equipment Ljava/util/Optional; + FIELD f_jhxzkssw vehicle Ljava/util/Optional; + FIELD f_jnmwkhde team Ljava/util/Optional; + FIELD f_pucztlsm effects Ljava/util/Optional; + FIELD f_qeendvut steppingOn Ljava/util/Optional; + FIELD f_qfcgduht passenger Ljava/util/Optional; + FIELD f_qfiiycir type Ljava/util/Optional; + FIELD f_rzqpiapu nbt Ljava/util/Optional; + FIELD f_tjhcdgoz location Ljava/util/Optional; + FIELD f_upesirxb flags Ljava/util/Optional; + FIELD f_xwwrgnab typeSpecific Ljava/util/Optional; + METHOD m_dscijmse vehicle (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + METHOD m_dxowdvhv targetedEntity (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; 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; ARG 1 typeSpecific 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;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; - ARG 1 location + METHOD m_isspaqjq location (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; 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;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; - ARG 1 effects - METHOD m_nqtoxgxm flags (Lnet/minecraft/unmapped/C_rptqszvm;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; - ARG 1 flags + METHOD m_mqcqikci effects (Lnet/minecraft/unmapped/C_nysuqcvh$C_tmpwnbuk;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + METHOD m_nqtoxgxm flags (Lnet/minecraft/unmapped/C_rptqszvm$C_nbivukxv;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; 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;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; - ARG 1 passenger - METHOD m_qztugqib steppingOn (Lnet/minecraft/unmapped/C_ypvebgnl;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; - ARG 1 location + METHOD m_pthqlbeh build ()Ljava/util/Optional; + METHOD m_qmnpijza passenger (Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; + METHOD m_qztugqib steppingOn (Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;)Lnet/minecraft/unmapped/C_kvkvpjlm$C_fnhnavbg; 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/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping index ec66c7432f..216aa25ec1 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping @@ -1,20 +1,7 @@ CLASS net/minecraft/unmapped/C_wrnalooj net/minecraft/predicate/entity/EntityTypePredicate - FIELD f_mtwxkmsq ANY Lnet/minecraft/unmapped/C_wrnalooj; - FIELD f_owamdfvg COMMA_JOINER Lcom/google/common/base/Joiner; - METHOD m_cyngmtoh fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_wrnalooj; - ARG 0 json METHOD m_qdgpzgnx createTagged (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_wrnalooj; ARG 0 tag - METHOD m_sklrgmph toJson ()Lcom/google/gson/JsonElement; METHOD m_tlsrbqih matches (Lnet/minecraft/unmapped/C_ogavsvbr;)Z ARG 1 type METHOD m_vtgchxgt create (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_wrnalooj; ARG 0 type - CLASS C_oiaspyeo Tagged - FIELD f_yljmwpha tag Lnet/minecraft/unmapped/C_ednuhnnn; - METHOD (Lnet/minecraft/unmapped/C_ednuhnnn;)V - ARG 1 tag - CLASS C_udzkqatz Single - FIELD f_ypmaanil type Lnet/minecraft/unmapped/C_ogavsvbr; - METHOD (Lnet/minecraft/unmapped/C_ogavsvbr;)V - ARG 1 type diff --git a/mappings/net/minecraft/predicate/entity/EntityVariantPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityVariantPredicate.mapping index 61e35cf267..ef17253566 100644 --- a/mappings/net/minecraft/predicate/entity/EntityVariantPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityVariantPredicate.mapping @@ -1,14 +1,11 @@ CLASS net/minecraft/unmapped/C_doqtwgml net/minecraft/predicate/entity/EntityVariantPredicate FIELD f_ozxqbksz type Lnet/minecraft/unmapped/C_ljtxhtrw$C_dvgoxmwq; FIELD f_trwtfaif function Ljava/util/function/Function; - FIELD f_xpfaxzfh VARIANT_KEY Ljava/lang/String; METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)V ARG 2 function - METHOD m_mrsklpcv (Lcom/mojang/serialization/Codec;Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_ljtxhtrw; - ARG 2 json METHOD m_ognacyst create (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_doqtwgml; ARG 1 function - METHOD m_tpgwhojq createTypeSpecific (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_ljtxhtrw; + METHOD m_tpgwhojq createTypeSpecific (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_doqtwgml$C_wcovppod; ARG 1 variant METHOD m_wchdpmxt create (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_doqtwgml; ARG 1 function diff --git a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping index 1b378925ec..ecffa881c5 100644 --- a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping @@ -1,10 +1,3 @@ CLASS net/minecraft/unmapped/C_cuxhqqlz net/minecraft/predicate/entity/FishingHookPredicate - FIELD f_okhngoyi inOpenWater Z - FIELD f_pjcczptw IN_OPEN_WATER Ljava/lang/String; + FIELD f_okhngoyi inOpenWater Ljava/util/Optional; FIELD f_wfcosvey ANY Lnet/minecraft/unmapped/C_cuxhqqlz; - METHOD (Z)V - ARG 1 inOpenWater - METHOD m_eydzvbuh of (Z)Lnet/minecraft/unmapped/C_cuxhqqlz; - ARG 0 inOpenWater - METHOD m_messfhxl fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_cuxhqqlz; - ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping deleted file mode 100644 index 17b3bb5b56..0000000000 --- a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/unmapped/C_edhuufgj net/minecraft/predicate/entity/LightningBoltPredicate - FIELD f_cuuzyuqy ENTITY_STRUCK_KEY Ljava/lang/String; - FIELD f_suksleqt blocksSetOnFire Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_tdsumyou entityStruck Lnet/minecraft/unmapped/C_kvkvpjlm; - FIELD f_xeacefsp BLOCKS_SET_ON_FIRE_KEY Ljava/lang/String; - METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_kvkvpjlm;)V - ARG 1 blocksSetOnFire - ARG 2 entityStruck - METHOD m_gquvjdvb fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_edhuufgj; - ARG 0 json - METHOD m_lrxzzbsd of (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_edhuufgj; - ARG 0 blocksSetOnFire - METHOD m_usjohnno (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;)Z - ARG 3 struckEntity diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 018d4fce6c..a128c99fff 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -1,66 +1,38 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationPredicate - FIELD f_bueuinho light Lnet/minecraft/unmapped/C_ammgthmo; - FIELD f_ciplxqsv biome Lnet/minecraft/unmapped/C_xhhleach; - FIELD f_etmwdsjb x Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_ewfovfvc block Lnet/minecraft/unmapped/C_uuwlfkxz; - FIELD f_hpxpdelt smokey Ljava/lang/Boolean; - FIELD f_jpvpwzds ANY Lnet/minecraft/unmapped/C_ypvebgnl; - FIELD f_knnnesvj z Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_qfhzmnrp y Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_rxsimesc dimension Lnet/minecraft/unmapped/C_xhhleach; - FIELD f_sapupztq structure Lnet/minecraft/unmapped/C_xhhleach; - FIELD f_wbnakoue fluid Lnet/minecraft/unmapped/C_fjarvlro; - FIELD f_xgpxppia LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Boolean;Lnet/minecraft/unmapped/C_ammgthmo;Lnet/minecraft/unmapped/C_uuwlfkxz;Lnet/minecraft/unmapped/C_fjarvlro;)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 biome - ARG 5 structure - ARG 6 dimension - ARG 7 smokey - ARG 8 light - ARG 9 block - ARG 10 fluid - METHOD m_azdeqzjg biome (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl; - ARG 0 biome + FIELD f_bueuinho light Ljava/util/Optional; + FIELD f_ciplxqsv biome Ljava/util/Optional; + FIELD f_ewfovfvc block Ljava/util/Optional; + FIELD f_hpxpdelt smokey Ljava/util/Optional; + FIELD f_rxsimesc dimension Ljava/util/Optional; + FIELD f_sapupztq structure Ljava/util/Optional; + FIELD f_wbnakoue fluid Ljava/util/Optional; METHOD m_fjqulsaw toJson ()Lcom/google/gson/JsonElement; - METHOD m_kwtujuhk withY (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl; - ARG 0 y - METHOD m_mfhooeto dimension (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl; - ARG 0 dimension - METHOD m_qfdxwmeg fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_ypvebgnl; + METHOD m_qfdxwmeg fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD m_vmdyzmpu test (Lnet/minecraft/unmapped/C_bdwnwhiu;DDD)Z ARG 1 world ARG 2 x ARG 4 y ARG 6 z - METHOD m_xtlohiom withStructure (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl; - ARG 0 structure CLASS C_okutxubz Builder - FIELD f_dnpxvyqk fluid Lnet/minecraft/unmapped/C_fjarvlro; - FIELD f_dsialmis block Lnet/minecraft/unmapped/C_uuwlfkxz; + FIELD f_dnpxvyqk fluid Ljava/util/Optional; + FIELD f_dsialmis block Ljava/util/Optional; FIELD f_fhwlhfkz z Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; FIELD f_hyqkkafq x Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_iftoucej biome Lnet/minecraft/unmapped/C_xhhleach; - FIELD f_nouofwup structure Lnet/minecraft/unmapped/C_xhhleach; - FIELD f_qasujtxj dimension Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_iftoucej biome Ljava/util/Optional; + FIELD f_nouofwup structure Ljava/util/Optional; + FIELD f_qasujtxj dimension Ljava/util/Optional; FIELD f_vgpejppz y Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn; - FIELD f_xezgeelf light Lnet/minecraft/unmapped/C_ammgthmo; - FIELD f_yijrvruc smokey Ljava/lang/Boolean; - METHOD m_diuvndpc light (Lnet/minecraft/unmapped/C_ammgthmo;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; - ARG 1 light + 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; 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;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; - ARG 1 fluid - METHOD m_fxeygeib smokey (Ljava/lang/Boolean;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; - ARG 1 smokey + METHOD m_dxvijcur fluid (Lnet/minecraft/unmapped/C_fjarvlro$C_ahtnwewe;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; + METHOD m_fxeygeib smokey (Z)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; 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;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; - ARG 1 block + METHOD m_hibprzfm block (Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; 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 @@ -70,4 +42,4 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP ARG 1 dimension METHOD m_umdksspn x (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz; ARG 1 x - METHOD m_yapcqldj build ()Lnet/minecraft/unmapped/C_ypvebgnl; + METHOD m_yapcqldj build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping index 91c949b3b6..50a5272fff 100644 --- a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping @@ -2,7 +2,5 @@ CLASS net/minecraft/unmapped/C_zqlvqfuz net/minecraft/predicate/entity/SlimePred FIELD f_dsxpixqr size Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; METHOD (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V ARG 1 size - METHOD m_mjemiran fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_zqlvqfuz; - ARG 0 json METHOD m_tuscutsy of (Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Lnet/minecraft/unmapped/C_zqlvqfuz; ARG 0 size diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index c47477206c..94f9df7a91 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -1,12 +1,7 @@ CLASS net/minecraft/unmapped/C_ljtxhtrw net/minecraft/predicate/entity/TypeSpecificPredicate - FIELD f_lwgvdskm ANY Lnet/minecraft/unmapped/C_ljtxhtrw; - METHOD m_apmjspgo toJson ()Lcom/google/gson/JsonElement; - METHOD m_cxwzajph getCustomDataToJson ()Lcom/google/gson/JsonObject; METHOD m_giwcixwt ofCatVariant (Lnet/minecraft/unmapped/C_jpfecwuz;)Lnet/minecraft/unmapped/C_ljtxhtrw; ARG 0 type METHOD m_grjficxm getType ()Lnet/minecraft/unmapped/C_ljtxhtrw$C_dvgoxmwq; - METHOD m_iczkqwxe fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_ljtxhtrw; - ARG 0 json METHOD m_oztqyaor matches (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_vgpupfxx;)Z ARG 1 entity ARG 2 world @@ -14,8 +9,6 @@ CLASS net/minecraft/unmapped/C_ljtxhtrw net/minecraft/predicate/entity/TypeSpeci METHOD m_urpienkv ofFrogVariant (Lnet/minecraft/unmapped/C_idxitzip;)Lnet/minecraft/unmapped/C_ljtxhtrw; ARG 0 type CLASS C_dvgoxmwq Type - METHOD deserialize deserialize (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_ljtxhtrw; - ARG 1 json CLASS C_wprvyeic Types FIELD f_arvgoxpd FROG Lnet/minecraft/unmapped/C_doqtwgml; FIELD f_cdbpndzm HORSE Lnet/minecraft/unmapped/C_doqtwgml; @@ -48,14 +41,10 @@ CLASS net/minecraft/unmapped/C_ljtxhtrw net/minecraft/predicate/entity/TypeSpeci ARG 0 entity METHOD m_ojppqixd (Lnet/minecraft/unmapped/C_astfners;)Ljava/util/Optional; ARG 0 entity - METHOD m_omknhmqe (Lnet/minecraft/unmapped/C_astfners;)Ljava/util/Optional; - ARG 0 entity METHOD m_qmdyhqro (Lnet/minecraft/unmapped/C_astfners;)Ljava/util/Optional; ARG 0 entity METHOD m_qmgjjjtx (Lnet/minecraft/unmapped/C_astfners;)Ljava/util/Optional; ARG 0 entity - METHOD m_uzonwblb (Lcom/google/gson/JsonObject;)Lnet/minecraft/unmapped/C_ljtxhtrw; - ARG 0 json METHOD m_vcfwpwtu (Lnet/minecraft/unmapped/C_astfners;)Ljava/util/Optional; ARG 0 entity METHOD m_xpoaonxo (Lnet/minecraft/unmapped/C_astfners;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index 929e8dd701..a2e2ce1e78 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -1,15 +1,8 @@ CLASS net/minecraft/unmapped/C_mybjijbl net/minecraft/predicate/item/EnchantmentPredicate - FIELD f_dryercqz ARRAY_OF_ANY [Lnet/minecraft/unmapped/C_mybjijbl; FIELD f_gtfgsrms levels Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_hpjtfqjy enchantment Lnet/minecraft/unmapped/C_jxtrubuh; - FIELD f_msaactqt ANY Lnet/minecraft/unmapped/C_mybjijbl; + FIELD f_hpjtfqjy enchantment Ljava/util/Optional; METHOD (Lnet/minecraft/unmapped/C_jxtrubuh;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)V ARG 1 enchantment ARG 2 levels - METHOD m_cyztuezp deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/unmapped/C_mybjijbl; - ARG 0 el - METHOD m_qriifhwk deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_mybjijbl; - ARG 0 el METHOD m_ucdsbwam test (Ljava/util/Map;)Z ARG 1 enchantments - METHOD m_zvchpecf serialize ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 731bfc82a1..5b626772af 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -1,41 +1,29 @@ CLASS net/minecraft/unmapped/C_afravpde net/minecraft/predicate/item/ItemPredicate - FIELD f_baffcgsf tag Lnet/minecraft/unmapped/C_ednuhnnn; + FIELD f_baffcgsf tag Ljava/util/Optional; FIELD f_bywmemnt durability Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_gmzwedyh potion Lnet/minecraft/unmapped/C_almkolgw; - FIELD f_gzmnszun nbt Lnet/minecraft/unmapped/C_emmbeecz; - FIELD f_qcqwzfeh ANY Lnet/minecraft/unmapped/C_afravpde; - FIELD f_rujewyja storedEnchantments [Lnet/minecraft/unmapped/C_mybjijbl; - FIELD f_rumeafbo enchantments [Lnet/minecraft/unmapped/C_mybjijbl; + FIELD f_gmzwedyh potion Ljava/util/Optional; + FIELD f_gzmnszun nbt Ljava/util/Optional; + FIELD f_rujewyja storedEnchantments Ljava/util/List; + FIELD f_rumeafbo enchantments Ljava/util/List; FIELD f_unmuvhdr count Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_zipcqdwu items Ljava/util/Set; - METHOD (Lnet/minecraft/unmapped/C_ednuhnnn;Ljava/util/Set;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;[Lnet/minecraft/unmapped/C_mybjijbl;[Lnet/minecraft/unmapped/C_mybjijbl;Lnet/minecraft/unmapped/C_almkolgw;Lnet/minecraft/unmapped/C_emmbeecz;)V - ARG 1 tag - ARG 2 items - ARG 3 count - ARG 4 durability - ARG 5 enchantments - ARG 6 storedEnchantments - ARG 7 potion - ARG 8 nbt - METHOD m_iftxvtov deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/unmapped/C_afravpde; + FIELD f_zipcqdwu items Ljava/util/Optional; + METHOD m_iftxvtov deserializeAll (Lcom/google/gson/JsonElement;)Ljava/util/List; ARG 0 el - METHOD m_nqcovmeo fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/unmapped/C_afravpde; + METHOD m_nqcovmeo fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 el - METHOD m_skkkgwcs (Lnet/minecraft/unmapped/C_ncpywfca;)Lcom/google/gson/JsonSyntaxException; - ARG 0 id METHOD m_utreslrr toJson ()Lcom/google/gson/JsonElement; METHOD m_wzsvfrqv test (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 stack CLASS C_qwujnjpk Builder - FIELD f_bvvzhtxw enchantments Ljava/util/List; - FIELD f_kwxgdiqs item Ljava/util/Set; + FIELD f_bvvzhtxw enchantments Lcom/google/common/collect/ImmutableList$Builder; + FIELD f_kwxgdiqs item Ljava/util/Optional; FIELD f_lmnevexr durability Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_pkpeqxtb storedEnchantments Ljava/util/List; - FIELD f_rpncutru nbt Lnet/minecraft/unmapped/C_emmbeecz; - FIELD f_wdpglprm tag Lnet/minecraft/unmapped/C_ednuhnnn; + FIELD f_pkpeqxtb storedEnchantments Lcom/google/common/collect/ImmutableList$Builder; + FIELD f_rpncutru nbt Ljava/util/Optional; + FIELD f_wdpglprm tag Ljava/util/Optional; FIELD f_xksdidbg count Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb; - FIELD f_zyhxpmvk potion Lnet/minecraft/unmapped/C_almkolgw; - METHOD m_aaksgfhj build ()Lnet/minecraft/unmapped/C_afravpde; + FIELD f_zyhxpmvk potion Ljava/util/Optional; + METHOD m_aaksgfhj build ()Ljava/util/Optional; METHOD m_gqzbccdh potion (Lnet/minecraft/unmapped/C_almkolgw;)Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk; ARG 1 potion METHOD m_kqevzcer enchantment (Lnet/minecraft/unmapped/C_mybjijbl;)Lnet/minecraft/unmapped/C_afravpde$C_qwujnjpk; diff --git a/mappings/net/minecraft/registry/HolderSet.mapping b/mappings/net/minecraft/registry/HolderSet.mapping index 4fe2e927ec..d77a0e1516 100644 --- a/mappings/net/minecraft/registry/HolderSet.mapping +++ b/mappings/net/minecraft/registry/HolderSet.mapping @@ -10,9 +10,6 @@ CLASS net/minecraft/unmapped/C_odfnijdo net/minecraft/registry/HolderSet METHOD m_jjqfwyhn getTagOrContents ()Lcom/mojang/datafixers/util/Either; METHOD m_jqfffidc get (I)Lnet/minecraft/unmapped/C_cjzoxshv; ARG 1 i - METHOD m_kxorivib createDirect (Ljava/util/function/Function;Ljava/util/List;)Lnet/minecraft/unmapped/C_odfnijdo$C_zmwjwbow; - ARG 0 contentsMapper - ARG 1 contents METHOD m_lhrpzjgq getRandomElement (Lnet/minecraft/unmapped/C_rlomrsco;)Ljava/util/Optional; ARG 1 random METHOD m_onucpopt contains (Lnet/minecraft/unmapped/C_cjzoxshv;)Z diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping index d465e67868..64c464ab18 100644 --- a/mappings/net/minecraft/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/registry/MutableRegistry.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/unmapped/C_eexxncvi net/minecraft/registry/MutableRegistry - METHOD m_klxbakqc set (ILnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/unmapped/C_cjzoxshv; - ARG 1 rawId - ARG 2 key - ARG 3 entry - ARG 4 lifecycle METHOD m_uapzeinx empty ()Z METHOD m_ulbocxwk getHolderProvider ()Lnet/minecraft/unmapped/C_pzdchrcy; METHOD m_yomgwjob register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index ce6e25b580..0876a1bb9c 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -29,11 +29,6 @@ CLASS net/minecraft/unmapped/C_tqxyjqsk net/minecraft/registry/Registry ARG 1 key METHOD m_jrpizpyt getHolder (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; ARG 1 key - METHOD m_jwfzqreg register (Lnet/minecraft/unmapped/C_tqxyjqsk;ILjava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 registry - ARG 1 rawId - ARG 2 id - ARG 3 entry METHOD m_keyttxmd getTagOrEmpty (Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/lang/Iterable; ARG 1 tag METHOD m_leajtcub stream ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping index c438409124..70fb34eeb6 100644 --- a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping @@ -27,10 +27,10 @@ CLASS net/minecraft/unmapped/C_hgcbvrbw net/minecraft/screen/AbstractFurnaceScre ARG 5 playerInventory ARG 6 inventory ARG 7 propertyDelegate - METHOD m_ejlyeczv getCookProgress ()I + METHOD m_ejlyeczv getCookProgress ()F METHOD m_hoqkpdjn isSmeltable (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 itemStack - METHOD m_mjfixhiu getFuelProgress ()I + METHOD m_mjfixhiu getFuelProgress ()F METHOD m_ppkytoyf isBurning ()Z METHOD m_sidcfqcj isFuel (Lnet/minecraft/unmapped/C_sddaxwyk;)Z ARG 1 itemStack diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 59aaff3d22..bf8b508a26 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -81,7 +81,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD f_wmdvdqlf serverId Ljava/lang/String; FIELD f_wsnekgbx serverPort I FIELD f_xoafdfeu MS_PER_TICK I - FIELD f_xowtolim metricsData Lnet/minecraft/unmapped/C_hqvvtxmh; FIELD f_xpelegwm networkIo Lnet/minecraft/unmapped/C_mitbewqx; FIELD f_ydhbqcwa ANONYMOUS_GAME_PROFILE Lcom/mojang/authlib/GameProfile; FIELD f_ypvxjvas layeredRegistryManager Lnet/minecraft/unmapped/C_bcpxdrik; @@ -133,8 +132,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer COMMENT @see net.minecraft.server.network.ServerLoginNetworkHandler METHOD m_cpahzimu isStopping ()Z METHOD m_cuuhdoqu syncChunkWrites ()Z - METHOD m_cvtpuakg (Lnet/minecraft/unmapped/C_lvnjxuwi;)Ljava/lang/String; - ARG 0 profile METHOD m_dajeggfi getResourceManager ()Lnet/minecraft/unmapped/C_tmnrpasf; METHOD m_dbtaxkzj updateMobSpawnOptions ()V METHOD m_ddlaxvao getServerResourcePackProperties ()Ljava/util/Optional; @@ -178,8 +175,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD m_gicdpqlb (Ljava/nio/file/Path;)Z ARG 0 path METHOD m_glmgndav getOverworld ()Lnet/minecraft/unmapped/C_bdwnwhiu; - METHOD m_goropamt (Lnet/minecraft/unmapped/C_carvbxzj;Lnet/minecraft/unmapped/C_migzkpst;Ljava/lang/Throwable;)V - ARG 2 error METHOD m_gsecpirt shouldKeepTicking ()Z METHOD m_gzgtxora startServer (Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer; ARG 0 serverFactory @@ -229,9 +224,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD m_iqernmfn requireResourcePack ()Z METHOD m_ixudjtvq setDefaultGameMode (Lnet/minecraft/unmapped/C_lghcpyvl;)V ARG 1 gameMode - METHOD m_jcwgeutk (Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;Lcom/google/common/collect/ImmutableList;)Ljava/util/concurrent/CompletionStage; - ARG 2 packs - METHOD m_jgeevbvz getMetricsData ()Lnet/minecraft/unmapped/C_hqvvtxmh; METHOD m_jgzzempi areCommandBlocksEnabled ()Z COMMENT Specifies whether command blocks can execute commands on the server. METHOD m_kbcfaaja tickWorlds (Ljava/util/function/BooleanSupplier;)V @@ -253,8 +245,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD m_lprqwxbm setServerId (Ljava/lang/String;)V ARG 1 serverId METHOD m_magpcgdt getWorldRegistryKeys ()Ljava/util/Set; - METHOD m_micghkvm (Ljava/util/Collection;Ljava/lang/String;)Z - ARG 1 dataPackName METHOD m_mjweogem getBossBarManager ()Lnet/minecraft/unmapped/C_xtwgkoiw; METHOD m_mnwbpdpc getStructureTemplateManager ()Lnet/minecraft/unmapped/C_zxhjfyir; METHOD m_naezauaw setMotd (Ljava/lang/String;)V @@ -425,8 +415,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer COMMENT COMMENT

A dedicated server refers to a Minecraft server implementation which is detached from a parent Minecraft client process. COMMENT A dedicated Minecraft server only accepts remote connections. - METHOD m_xpcspnzz (Ljava/util/Collection;Lnet/minecraft/server/MinecraftServer$C_eaujwdwn;)V - ARG 2 resourceManager METHOD m_xturscpm getPlayerNames ()[Ljava/lang/String; METHOD m_xvswnjyk getPlayerInteractionManager (Lnet/minecraft/unmapped/C_mxrobsgg;)Lnet/minecraft/unmapped/C_egnasquq; ARG 1 player @@ -446,8 +434,6 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD m_yvsocvtk resetRecorder ()V METHOD m_zopvbxou getSaveProperties ()Lnet/minecraft/unmapped/C_jkevluio; METHOD m_zprgpanc startDebug ()V - METHOD m_zqrurnwg (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_dzczqjri;)V - ARG 2 result METHOD m_zsxirona getServerIp ()Ljava/lang/String; METHOD m_zueyhxqi loadFavicon ()Ljava/util/Optional; METHOD m_zvxfodpo runOneTask ()Z diff --git a/mappings/net/minecraft/stat/StatType.mapping b/mappings/net/minecraft/stat/StatType.mapping index 7ac9ae63e0..5104984596 100644 --- a/mappings/net/minecraft/stat/StatType.mapping +++ b/mappings/net/minecraft/stat/StatType.mapping @@ -2,14 +2,11 @@ CLASS net/minecraft/unmapped/C_qwzfcpmd net/minecraft/stat/StatType FIELD f_ejtjtceu registry Lnet/minecraft/unmapped/C_tqxyjqsk; FIELD f_ltemdxih stats Ljava/util/Map; FIELD f_sxmlcwsz name Lnet/minecraft/unmapped/C_rdaqiwdt; - METHOD (Lnet/minecraft/unmapped/C_tqxyjqsk;)V - ARG 1 registry METHOD iterator iterator ()Ljava/util/Iterator; METHOD m_cmsciyjx getName ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_enpioyhi getOrCreateStat (Ljava/lang/Object;Lnet/minecraft/unmapped/C_eihuzrnt;)Lnet/minecraft/unmapped/C_sibrxbfy; ARG 1 key ARG 2 formatter - METHOD m_icbjdstx getTranslationKey ()Ljava/lang/String; METHOD m_ksqhvvaf hasStat (Ljava/lang/Object;)Z ARG 1 key METHOD m_ntjegtqo getRegistry ()Lnet/minecraft/unmapped/C_tqxyjqsk; diff --git a/mappings/net/minecraft/unmapped/C_ctsfmifk.mapping b/mappings/net/minecraft/unmapped/C_ctsfmifk.mapping index fea8d0b313..8e56c6ac0d 100644 --- a/mappings/net/minecraft/unmapped/C_ctsfmifk.mapping +++ b/mappings/net/minecraft/unmapped/C_ctsfmifk.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/unmapped/C_ctsfmifk - FIELD f_yxgkwomu lootConditions [Lnet/minecraft/unmapped/C_vqkczpuv; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;)V - ARG 1 lootConditions + 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/unmapped/C_xaygoojx.mapping b/mappings/net/minecraft/unmapped/C_xaygoojx.mapping index 62edf45d96..f32747b2ab 100644 --- a/mappings/net/minecraft/unmapped/C_xaygoojx.mapping +++ b/mappings/net/minecraft/unmapped/C_xaygoojx.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/unmapped/C_xaygoojx FIELD f_toqcjiql identifier Lnet/minecraft/unmapped/C_ncpywfca; - METHOD ([Lnet/minecraft/unmapped/C_vqkczpuv;Lnet/minecraft/unmapped/C_ncpywfca;)V - ARG 1 conditions diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index d0cadf4703..1f3ed48010 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -64,10 +64,6 @@ CLASS net/minecraft/unmapped/C_qtbzyiey net/minecraft/util/JsonHelper ARG 0 object ARG 1 element ARG 2 defaultBoolean - METHOD m_fkcdbyob getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_vorddnax; - ARG 0 object - ARG 1 key - ARG 2 defaultItem METHOD m_fmrzdkwt deserialize (Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 0 content METHOD m_glczdxjk getBigDecimal (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/math/BigDecimal; @@ -153,9 +149,6 @@ CLASS net/minecraft/unmapped/C_qtbzyiey net/minecraft/util/JsonHelper ARG 0 object ARG 1 name ARG 2 defaultArray - METHOD m_qaeaeqvl getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/unmapped/C_vorddnax; - ARG 0 object - ARG 1 key METHOD m_qdlanghw getDouble (Lcom/google/gson/JsonObject;Ljava/lang/String;D)D ARG 0 object ARG 1 element @@ -211,7 +204,7 @@ CLASS net/minecraft/unmapped/C_qtbzyiey net/minecraft/util/JsonHelper ARG 1 reader ARG 2 type ARG 3 lenient - METHOD m_vuymnonf asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lnet/minecraft/unmapped/C_vorddnax; + METHOD m_vuymnonf asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lnet/minecraft/unmapped/C_cjzoxshv; ARG 0 element ARG 1 name METHOD m_wpgoaqjx getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;J)J diff --git a/mappings/net/minecraft/util/JsonSerializableType.mapping b/mappings/net/minecraft/util/JsonSerializableType.mapping deleted file mode 100644 index 51f72d03e6..0000000000 --- a/mappings/net/minecraft/util/JsonSerializableType.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/unmapped/C_qobefvqf net/minecraft/util/JsonSerializableType - FIELD f_zabsaemz jsonSerializer Lnet/minecraft/unmapped/C_qdtgrmkp; - METHOD (Lnet/minecraft/unmapped/C_qdtgrmkp;)V - ARG 1 jsonSerializer - METHOD m_ticbuuam getJsonSerializer ()Lnet/minecraft/unmapped/C_qdtgrmkp; diff --git a/mappings/net/minecraft/util/JsonSerializer.mapping b/mappings/net/minecraft/util/JsonSerializer.mapping deleted file mode 100644 index 91af6b529c..0000000000 --- a/mappings/net/minecraft/util/JsonSerializer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/unmapped/C_qdtgrmkp net/minecraft/util/JsonSerializer - METHOD m_ivrfyumv fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 context - METHOD m_lkizallr toJson (Lcom/google/gson/JsonObject;Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 object - ARG 3 context diff --git a/mappings/net/minecraft/util/JsonSerializing.mapping b/mappings/net/minecraft/util/JsonSerializing.mapping deleted file mode 100644 index 0f9929664f..0000000000 --- a/mappings/net/minecraft/util/JsonSerializing.mapping +++ /dev/null @@ -1,72 +0,0 @@ -CLASS net/minecraft/unmapped/C_xaxdohtf net/minecraft/util/JsonSerializing - METHOD m_zwpruqse createSerializerBuilder (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_xaxdohtf$C_yixeccym; - ARG 0 registry - ARG 1 rootFieldName - ARG 2 idFieldName - ARG 3 typeGetter - CLASS C_fclypocy ElementSerializer - METHOD m_tovbndjt toJson (Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 object - ARG 2 context - METHOD m_zjimmkqq fromJson (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 context - CLASS C_gjcixcyc GsonSerializer - FIELD f_biwcvbut typeGetter Ljava/util/function/Function; - FIELD f_ekijghod elementSerializer Lcom/mojang/datafixers/util/Pair; - FIELD f_fgjbkyoj registry Lnet/minecraft/unmapped/C_tqxyjqsk; - FIELD f_jtecxylj idFieldName Ljava/lang/String; - FIELD f_uigwtplg defaultType Lnet/minecraft/unmapped/C_qobefvqf; - FIELD f_wbgwujef rootFieldName Ljava/lang/String; - METHOD (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qobefvqf;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 registry - ARG 2 rootFieldName - ARG 3 idFieldName - ARG 4 typeGetter - ARG 5 defaultType - ARG 6 elementSerializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 type - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 object - ARG 2 type - ARG 3 context - CLASS C_yixeccym SerializerBuilder - COMMENT A builder for serializing types to JSON that can either obtain a type from - COMMENT a registry to handle JSON conversion or handle with a custom logic bound - COMMENT to a type. - COMMENT - COMMENT

When the root element read is an object, the built serializer obtains the type - COMMENT from registry to handle reading; otherwise, it falls back to custom - COMMENT logic. - FIELD f_doyedfmw registry Lnet/minecraft/unmapped/C_tqxyjqsk; - FIELD f_mbygbbmz typeGetter Ljava/util/function/Function; - FIELD f_stpggzft idFieldName Ljava/lang/String; - FIELD f_tnjeiqgs rootFieldName Ljava/lang/String; - FIELD f_uooeuxyc defaultType Lnet/minecraft/unmapped/C_qobefvqf; - FIELD f_xwxanxbv elementSerializer Lcom/mojang/datafixers/util/Pair; - METHOD (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;)V - ARG 1 registry - ARG 2 rootFieldName - ARG 3 idFieldName - ARG 4 typeIdentification - METHOD m_loxnagrn defaultType (Lnet/minecraft/unmapped/C_qobefvqf;)Lnet/minecraft/unmapped/C_xaxdohtf$C_yixeccym; - COMMENT Sets the default type that is used when there's no ID field. - COMMENT - COMMENT @return this instance - ARG 1 defaultType - COMMENT the default type - METHOD m_opretjeh elementSerializer (Lnet/minecraft/unmapped/C_qobefvqf;Lnet/minecraft/unmapped/C_xaxdohtf$C_fclypocy;)Lnet/minecraft/unmapped/C_xaxdohtf$C_yixeccym; - COMMENT Sets the element serializer and its target type. It can serialize and - COMMENT deserialize instances of one type to non-{@link com.google.gson.JsonObject} - COMMENT elements. - COMMENT - COMMENT @apiNote There can only be one element serializer for this builder and - COMMENT the built serializer. Calling this method replaces any previous serializer. - ARG 1 type - COMMENT the target type of the element serializer - ARG 2 serializer - COMMENT the element serializer - METHOD m_whcxngbl build ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/MetricsData.mapping b/mappings/net/minecraft/util/MetricsData.mapping deleted file mode 100644 index 836e7ff0eb..0000000000 --- a/mappings/net/minecraft/util/MetricsData.mapping +++ /dev/null @@ -1,22 +0,0 @@ -CLASS net/minecraft/unmapped/C_hqvvtxmh net/minecraft/util/MetricsData - FIELD f_bwvdydnz SIZE I - FIELD f_ccysgxjf sampleCount I - FIELD f_rofzdmhv samples [J - FIELD f_rqtnqqiw startIndex I - FIELD f_rtoqupqu writeIndex I - METHOD m_aqhmzuem scaleAverageDuration (II)I - ARG 1 offset - ARG 2 oldScale - METHOD m_awzwbplh wrapIndex (I)I - ARG 1 index - METHOD m_emczloxk pushSample (J)V - ARG 1 time - METHOD m_icfijzas getAverageDuration (I)J - ARG 1 offset - METHOD m_jyqrlgqj getStartIndex ()I - METHOD m_lgtqtwsy scaleSample (JII)I - ARG 1 sample - ARG 3 oldScale - ARG 4 newScale - METHOD m_uqhtkcpv getSamples ()[J - METHOD m_xlfemgiv getCurrentIndex ()I diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index db5a3e2efb..3470469ab9 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -27,14 +27,10 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs FIELD f_wqiemdiy NON_EMPTY_STRING Lcom/mojang/serialization/Codec; FIELD f_xprfobkx AXISANGLE4F Lcom/mojang/serialization/Codec; FIELD f_zhwzaxnp VECTOR3F Lcom/mojang/serialization/Codec; - METHOD m_ceqposdb (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 string METHOD m_ceufsyxl withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 codec ARG 1 applyFunction ARG 2 coApplyFunction - METHOD m_cjkdnnjx (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 0 json METHOD m_dujfhivb orElsePartial (Ljava/lang/Object;)Lcom/mojang/serialization/Codec$ResultFunction; ARG 0 partial METHOD m_htlmmuvh (Ljava/lang/Object;)Ljava/lang/Object; @@ -86,8 +82,6 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs METHOD m_lytzwisw validate (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 codec ARG 1 validator - METHOD m_mcwzjvkz (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lcom/mojang/serialization/DataResult; - ARG 0 text METHOD m_mfpnjepb (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 string METHOD m_nsiytucc withNonEmptyList (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; @@ -194,20 +188,6 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs ARG 1 element ARG 2 ops ARG 3 input - CLASS C_shczgrzo Lazy - FIELD f_fhlpttkp delegate Ljava/util/function/Supplier; - METHOD (Ljava/util/function/Supplier;)V - ARG 1 delegate - METHOD decode decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input - METHOD encode encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 object - ARG 2 ops - ARG 3 input - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD m_npuqhxuv delegate ()Ljava/util/function/Supplier; CLASS C_utmdutep EitherCodec FIELD f_nlqguygj right Lcom/mojang/serialization/Codec; FIELD f_okalfhwr left Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/util/profiling/jfr/data/TimestampedData.mapping b/mappings/net/minecraft/util/profiling/jfr/data/TimestampedData.mapping deleted file mode 100644 index 6c288f7d59..0000000000 --- a/mappings/net/minecraft/util/profiling/jfr/data/TimestampedData.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/unmapped/C_ktlzftjj net/minecraft/util/profiling/jfr/data/TimestampedData - METHOD m_rjghxmum getTimestamp ()Ljava/time/Instant; diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 6110ab441c..7216243b70 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -101,8 +101,6 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers ARG 4 experience CLASS C_qmjmdnsj SuspiciousStewForEmeraldFactory FIELD f_ipzfjord priceMultiplier F - FIELD f_sydkoeca duration I - FIELD f_vutpwuzs effect Lnet/minecraft/unmapped/C_jaqasomh; FIELD f_xcdyxocc experience I METHOD (Lnet/minecraft/unmapped/C_jaqasomh;II)V ARG 1 effect