From 1d76ecf31bc424d0954718088416258d58aa852b Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Mon, 27 Jun 2022 03:05:16 +0900 Subject: [PATCH] 1.19-pre5 stuff (#3204) * 1.19-pre5 stuff * bring back arg mapping * Update mappings/net/minecraft/world/chunk/PalettedContainer.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Fix javadoc Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- mappings/net/minecraft/block/Block.mapping | 1 + .../minecraft/client/MinecraftClient.mapping | 4 ++ .../client/gui/hud/InGameHud.mapping | 4 ++ .../world/chunk/PalettedContainer.mapping | 46 +++++++++++++++++++ .../chunk/ReadableContainer.mapping} | 13 +++++- .../minecraft/world/gen/WorldPreset.mapping | 2 + 6 files changed, 69 insertions(+), 1 deletion(-) rename mappings/net/minecraft/{class_7522.mapping => world/chunk/ReadableContainer.mapping} (65%) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 49125fae75..e366ea5a8d 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -231,6 +231,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block METHOD method_9582 pushEntitiesUpBeforeBlockChange (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 from ARG 1 to + ARG 2 world ARG 3 pos METHOD method_9583 dropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)V ARG 1 world diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 8101f81a0d..14cb6e8329 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -488,6 +488,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 text METHOD method_44024 getRealms32BitWarningChecker ()Lnet/minecraft/class_7478; METHOD method_44256 getServicesSignatureVerifier ()Lnet/minecraft/class_7500; + METHOD method_44352 (Z)V + ARG 1 confirmed METHOD method_44375 setCurrentServerEntry (Lnet/minecraft/class_4877;Ljava/lang/String;)V ARG 1 server ARG 2 address @@ -504,6 +506,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient COMMENT COMMENT @see MinecraftClient#getChatRestriction() FIELD field_28944 description Lnet/minecraft/class_2561; + FIELD field_39456 MORE_INFO_TEXT Lnet/minecraft/class_2561; + FIELD field_39457 JAVA_ACCOUNT_SETTINGS_URL Ljava/lang/String; METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;)V ARG 3 description METHOD method_33885 getDescription ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index a39cd153d9..11795c06cd 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_35428 autosaveIndicatorAlpha F FIELD field_35429 lastAutosaveIndicatorAlpha F FIELD field_35430 SAVING_LEVEL_TEXT Lnet/minecraft/class_2561; + FIELD field_39458 canShowChatDisabledScreen Z METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_918;)V ARG 1 client ARG 2 itemRenderer @@ -170,6 +171,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud ARG 1 type ARG 2 message ARG 3 sender + METHOD method_44353 shouldShowChatDisabledScreen ()Z + METHOD method_44354 setCanShowChatDisabledScreen (Z)V + ARG 1 canShowChatDisabledScreen CLASS class_6411 HeartType FIELD field_33950 textureIndex I FIELD field_33951 hasBlinkingTexture Z diff --git a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping index 80ae16dcb4..e7495d3ac0 100644 --- a/mappings/net/minecraft/world/chunk/PalettedContainer.mapping +++ b/mappings/net/minecraft/world/chunk/PalettedContainer.mapping @@ -62,6 +62,8 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer ARG 2 y ARG 3 z ARG 4 value + METHOD method_38296 (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance METHOD method_38297 getCompatibleData (Lnet/minecraft/class_2841$class_6561;I)Lnet/minecraft/class_2841$class_6561; COMMENT {@return a compatible data object for the given entry {@code bits} size} COMMENT This may return a new data object or return {@code previousData} if it @@ -74,14 +76,58 @@ CLASS net/minecraft/class_2841 net/minecraft/world/chunk/PalettedContainer COMMENT Creates a codec for a paletted container with a specific palette provider. COMMENT COMMENT @return the created codec + ARG 0 idList ARG 1 entryCodec COMMENT the codec for each entry in the palette ARG 2 provider COMMENT the palette provider that controls how the data are serialized and what COMMENT types of palette are used for what entry bit sizes + ARG 3 defaultValue + ARG 4 reader + METHOD method_38302 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;Lnet/minecraft/class_7522;)Lnet/minecraft/class_7522$class_6562; + ARG 2 container + METHOD method_39793 (Ljava/util/function/Consumer;)V + COMMENT Executes an {@code action} on all values in the container's storage, sequentially. METHOD method_39794 (Ljava/util/function/Consumer;Lnet/minecraft/class_2837;I)V ARG 2 id + METHOD method_39894 applyEach ([ILjava/util/function/IntUnaryOperator;)V + COMMENT Applies {@code applier} to each value of {@code is}, modifying the array. + COMMENT + COMMENT @implNote This caches the last value to be applied and its result, so {@code applier} + COMMENT might not be called for all values. Note that this also causes the applier to + COMMENT not be applied for initial {@code -1}s. + ARG 0 is + ARG 1 applier METHOD method_39957 copy ()Lnet/minecraft/class_2841; + METHOD method_44340 (Lnet/minecraft/class_2814;I)I + ARG 2 id + METHOD method_44341 (Lnet/minecraft/class_2841;)Lnet/minecraft/class_7522; + ARG 0 result + METHOD method_44342 (Lnet/minecraft/class_7522$class_7523;Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;Lnet/minecraft/class_7522$class_6562;)Lcom/mojang/serialization/DataResult; + ARG 3 serialized + METHOD method_44343 createPalettedContainerCodec (Lnet/minecraft/class_2359;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2841$class_6563;Ljava/lang/Object;)Lcom/mojang/serialization/Codec; + ARG 0 idList + ARG 1 entryCodec + ARG 2 paletteProvider + ARG 3 defaultValue + METHOD method_44344 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2837;I)I + ARG 2 id + METHOD method_44346 read (Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;Lnet/minecraft/class_7522$class_6562;)Lcom/mojang/serialization/DataResult; + ARG 0 idList + ARG 1 paletteProvider + ARG 2 serialized + METHOD method_44347 createReadableContainerCodec (Lnet/minecraft/class_2359;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2841$class_6563;Ljava/lang/Object;)Lcom/mojang/serialization/Codec; + ARG 0 idList + ARG 1 entryCodec + ARG 2 paletteProvider + ARG 3 defaultValue + METHOD method_44348 (Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;Lnet/minecraft/class_7522$class_6562;)Lcom/mojang/serialization/DataResult; + ARG 0 idListx + ARG 1 paletteProviderx + ARG 2 serialized + METHOD method_44349 (ILjava/lang/Object;)I + ARG 0 id + ARG 1 value CLASS class_4464 Counter COMMENT A counter that receives a palette entry and its number of occurrences COMMENT in the container. diff --git a/mappings/net/minecraft/class_7522.mapping b/mappings/net/minecraft/world/chunk/ReadableContainer.mapping similarity index 65% rename from mappings/net/minecraft/class_7522.mapping rename to mappings/net/minecraft/world/chunk/ReadableContainer.mapping index b471a993ea..5c078a86ed 100644 --- a/mappings/net/minecraft/class_7522.mapping +++ b/mappings/net/minecraft/world/chunk/ReadableContainer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7522 +CLASS net/minecraft/class_7522 net/minecraft/world/chunk/ReadableContainer METHOD method_12321 get (III)Ljava/lang/Object; ARG 1 x ARG 2 y @@ -14,6 +14,12 @@ CLASS net/minecraft/class_7522 ARG 1 predicate METHOD method_21732 count (Lnet/minecraft/class_2841$class_4464;)V ARG 1 counter + METHOD method_39793 forEachValue (Ljava/util/function/Consumer;)V + ARG 1 action + METHOD method_44345 serialize (Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;)Lnet/minecraft/class_7522$class_6562; + ARG 1 idList + ARG 2 paletteProvider + METHOD method_44350 slice ()Lnet/minecraft/class_2841; CLASS class_6562 Serialized COMMENT The storage form of the paletted container in the {@linkplain COMMENT PalettedContainer#createCodec codec}. The {@code palette} is the entries @@ -27,3 +33,8 @@ CLASS net/minecraft/class_7522 COMMENT the data of the container METHOD comp_75 paletteEntries ()Ljava/util/List; METHOD comp_76 storage ()Ljava/util/Optional; + CLASS class_7523 Reader + METHOD read (Lnet/minecraft/class_2359;Lnet/minecraft/class_2841$class_6563;Lnet/minecraft/class_7522$class_6562;)Lcom/mojang/serialization/DataResult; + ARG 1 idList + ARG 2 paletteProvider + ARG 3 serialize diff --git a/mappings/net/minecraft/world/gen/WorldPreset.mapping b/mappings/net/minecraft/world/gen/WorldPreset.mapping index 8533108b2c..36d9411384 100644 --- a/mappings/net/minecraft/world/gen/WorldPreset.mapping +++ b/mappings/net/minecraft/world/gen/WorldPreset.mapping @@ -17,3 +17,5 @@ CLASS net/minecraft/class_7145 net/minecraft/world/gen/WorldPreset ARG 2 registryKey METHOD method_41590 getOverworldOrElseThrow ()Lnet/minecraft/class_5363; METHOD method_41591 createDimensionOptionsRegistry ()Lnet/minecraft/class_2378; + METHOD method_44351 validate (Lnet/minecraft/class_7145;)Lcom/mojang/serialization/DataResult; + ARG 0 preset