diff --git a/build.gradle b/build.gradle index 9e519efa2c..32004a901b 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,6 @@ dependencies { intermediary "net.fabricmc:intermediary:${minecraft_version}:v2" } - import org.objectweb.asm.ClassVisitor import org.objectweb.asm.Opcodes import org.quiltmc.draftsman.asm.visitor.DraftsmanAdapterClassVisitor @@ -116,9 +115,11 @@ clean.doFirst { tasks.build.dependsOn "compressTiny", "tinyJar", "v2UnmergedMappingsJar", "v2MergedMappingsJar" task insertAutoGeneratedMappings(dependsOn: [buildMappingsTiny, downloadPerVersionMappings], type: AddProposedMappingsTask) { + final enigmaProfile = file("enigma_profile.json") + inputJar.set mappings.fileConstants.perVersionMappingsJar inputMappings.set buildMappingsTiny.outputMappings - profile.set file("enigma_profile.json") + profile.set enigmaProfile } combineUnpickDefinitions { diff --git a/buildSrc/src/main/java/quilt/internal/tasks/build/AddProposedMappingsTask.java b/buildSrc/src/main/java/quilt/internal/tasks/build/AddProposedMappingsTask.java index adfcb8e712..20cb3e9521 100644 --- a/buildSrc/src/main/java/quilt/internal/tasks/build/AddProposedMappingsTask.java +++ b/buildSrc/src/main/java/quilt/internal/tasks/build/AddProposedMappingsTask.java @@ -2,19 +2,30 @@ import java.io.BufferedWriter; import java.io.File; +import java.io.IOException; import java.io.PrintWriter; import java.io.Reader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Locale; import java.util.Objects; - +import java.util.stream.Stream; + +import org.gradle.api.GradleException; +import org.gradle.api.file.FileCollection; +import org.gradle.api.file.RegularFile; +import org.gradle.api.file.RegularFileProperty; +import org.gradle.api.tasks.InputFiles; +import org.gradle.api.tasks.Optional; +import org.jetbrains.annotations.NotNull; import org.quiltmc.enigma.api.Enigma; import org.quiltmc.enigma.api.EnigmaProfile; import org.quiltmc.enigma.api.EnigmaProject; +import org.quiltmc.enigma.api.service.JarIndexerService; import org.quiltmc.enigma.command.Command; import org.quiltmc.enigma.command.FillClassMappingsCommand; import org.quiltmc.enigma.command.CommandsUtil; @@ -38,35 +49,63 @@ import quilt.internal.Constants; import quilt.internal.tasks.DefaultMappingsTask; -public class AddProposedMappingsTask extends DefaultMappingsTask { +import static org.quiltmc.enigma_plugin.Arguments.SIMPLE_TYPE_FIELD_NAMES_PATH; + +public abstract class AddProposedMappingsTask extends DefaultMappingsTask { + private static Path getPath(RegularFileProperty fileProperty) { + return fileProperty.map(RegularFile::getAsFile).map(File::toPath).get(); + } + @OutputFile public File outputMappings; @InputFile - private final Property inputJar; + public abstract RegularFileProperty getInputJar(); @InputFile - private final Property inputMappings; + public abstract RegularFileProperty getInputMappings(); @InputFile - private final Property profile; + public abstract RegularFileProperty getProfile(); + + @Optional + @InputFiles + protected abstract Property getSimpleTypeFieldNames(); public AddProposedMappingsTask() { super(Constants.Groups.BUILD_MAPPINGS_GROUP); - outputMappings = new File(fileConstants.buildDir, getName() + ".tiny"); - inputJar = getProject().getObjects().property(File.class); - inputMappings = getProject().getObjects().property(File.class); - profile = getProject().getObjects().property(File.class); + this.outputMappings = new File(fileConstants.buildDir, getName() + ".tiny"); + + this.getSimpleTypeFieldNames().set( + this.getProfile() + .map(RegularFile::getAsFile) + .map(File::toPath) + .map(profilePath -> { + try { + return this.getProject().files( + EnigmaProfile.read(profilePath).getServiceProfiles(JarIndexerService.TYPE).stream() + .flatMap(service -> service.getArgument(SIMPLE_TYPE_FIELD_NAMES_PATH).stream()) + .map(stringOrStrings -> stringOrStrings.mapBoth(Stream::of, Collection::stream)) + .flatMap(bothStringStreams -> + bothStringStreams.left().orElseGet(bothStringStreams::rightOrThrow) + ) + .toList() + ); + } catch (IOException e) { + throw new GradleException("Failed to read enigma profile", e); + } + }) + ); } @TaskAction public void addProposedMappings() throws Exception { getLogger().lifecycle(":seeking auto-mappable entries"); - Path input = inputMappings.get().toPath(); + Path input = getPath(this.getInputMappings()); Path output = outputMappings.toPath(); - Path jar = inputJar.get().toPath(); - Path profilePath = profile.map(File::toPath).get(); + Path jar = getPath(this.getInputJar()); + Path profilePath = getPath(this.getProfile()); addProposedMappings(input, output, fileConstants.tempDir.toPath(), jar, profilePath); } @@ -204,16 +243,4 @@ public File getOutputMappings() { public void setOutputMappings(File outputMappings) { this.outputMappings = outputMappings; } - - public Property getInputJar() { - return inputJar; - } - - public Property getInputMappings() { - return inputMappings; - } - - public Property getProfile() { - return profile; - } } diff --git a/buildSrc/src/main/resources/minecraft_specific_words.txt b/buildSrc/src/main/resources/minecraft_specific_words.txt index d506734d62..b3ec7ac56e 100644 --- a/buildSrc/src/main/resources/minecraft_specific_words.txt +++ b/buildSrc/src/main/resources/minecraft_specific_words.txt @@ -516,6 +516,7 @@ unicode // registry memoize +memoized unregister // javadoc diff --git a/mappings/net/minecraft/SharedConstants.mapping b/mappings/net/minecraft/SharedConstants.mapping index 94abe6d642..abcf157644 100644 --- a/mappings/net/minecraft/SharedConstants.mapping +++ b/mappings/net/minecraft/SharedConstants.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants FIELD f_cpvbggkb RESOURCE_GENERATION_DEBUG_OVERRIDE Z FIELD f_croffrlr ENABLE_WORLD_RECREATION_DEBUGGER Z FIELD f_cwtltrpn ENABLE_GOAL_SELECTOR_DEBUGGER Z + FIELD f_czwrerlm DEBUG_EXPERIMENTAL_REDSTONE_WIRE_UPDATE_ORDER Z FIELD f_daxksksq generateSquareTerrainWithoutNoise Z FIELD f_dwxtvjnd DEBUG_FEATURE_COUNT Z FIELD f_dzwzxzvb DISABLE_LIQUID_SPREADING Z diff --git a/mappings/net/minecraft/advancement/AdvancementRewards.mapping b/mappings/net/minecraft/advancement/AdvancementRewards.mapping index 6762b64cc4..b85df15d55 100644 --- a/mappings/net/minecraft/advancement/AdvancementRewards.mapping +++ b/mappings/net/minecraft/advancement/AdvancementRewards.mapping @@ -23,6 +23,8 @@ CLASS net/minecraft/unmapped/C_wptigggq net/minecraft/advancement/AdvancementRew METHOD m_rkbrzuwh addRecipe (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv; ARG 1 recipe METHOD m_sbnvjevi loot (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv; + ARG 0 loot METHOD m_xgembxfc function (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv; ARG 0 function METHOD m_xltlznvb addLoot (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv; + ARG 1 loot diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping index 29d04952cf..7a2cc21493 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/unmapped/C_ccuyenqy net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger METHOD m_bwskqxvw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_xhhleach;)V ARG 1 player + ARG 2 lootTable METHOD m_wjdeumci (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ccuyenqy$C_jvilurms;)Z ARG 1 conditions CLASS C_jvilurms Conditions FIELD f_zdzuorlo lootTable Lnet/minecraft/unmapped/C_xhhleach; METHOD m_ocoesmqp matches (Lnet/minecraft/unmapped/C_xhhleach;)Z + ARG 1 lootTable METHOD m_sdawxryt create (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz; diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index b9d8a6f5f2..7aaea64f00 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -254,7 +254,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock FIELD f_wvbmkgls suffocationPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc; FIELD f_xogzmbzi isTransparent Z FIELD f_xwxdktuf hasRandomTicks Z - FIELD f_xxewnzdk isFullCube Z + FIELD f_xxewnzdk opaqueFullCube Z FIELD f_ycbjvypj cullingFaces [Lnet/minecraft/unmapped/C_zscvhwbd; FIELD f_yypdsdkn lavaIgnitable Z FIELD f_zpvdfobl mapColor Lnet/minecraft/unmapped/C_mlrprqox; @@ -445,6 +445,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock METHOD m_tjbimmww canBucketPlace (Lnet/minecraft/unmapped/C_rxhyurmy;)Z ARG 1 fluid METHOD m_trxxnxke isRegistryKey (Lnet/minecraft/unmapped/C_xhhleach;)Z + ARG 1 key METHOD m_uawreshq getCameraCollisionShape (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_pbfjvesm;)Lnet/minecraft/unmapped/C_zscvhwbd; ARG 1 world ARG 2 pos @@ -561,6 +562,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock FIELD f_czlbhsfs dynamicBounds Z FIELD f_ddynwztk velocityMultiplier F FIELD f_dfulysva toolRequired Z + FIELD f_eioycbda key Lnet/minecraft/unmapped/C_xhhleach; FIELD f_gepbjyhg nonSolid Z FIELD f_gljcimhm emissiveLightingPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc; FIELD f_hgzeyqby randomTicks Z @@ -607,6 +609,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock ARG 1 predicate METHOD m_edlblpmg offsetType (Lnet/minecraft/unmapped/C_triydqro$C_hqjgaunn;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy; ARG 1 offsetType + METHOD m_egobildr (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 0 key METHOD m_etdgbdsz replaceable ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy; METHOD m_fqzrcagx jumpVelocityMultiplier (F)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy; ARG 1 jumpVelocityMultiplier @@ -671,6 +675,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock COMMENT @return this METHOD m_vuhrtmql (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_mlrprqox; ARG 0 state + METHOD m_vuvrdzlb key (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy; + ARG 1 key METHOD m_wlqavdtn mapColor (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy; ARG 1 dyeColor METHOD m_wrutkowk blockVision (Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy; diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 641bb6926c..c2ddf4a556 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks FIELD f_lfmqbeqz SHULKER_BOX_SUFFOCATES_PREDICATE Lnet/minecraft/unmapped/C_triydqro$C_izsedryc; + METHOD m_cptpfson register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq; + ARG 0 key METHOD m_knkwxiyx solid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z METHOD m_nmstzpxh spawnable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean; ARG 3 entityType @@ -11,4 +13,5 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks ARG 3 entityType METHOD m_tobwsgju waterlogMapColor (Lnet/minecraft/unmapped/C_mlrprqox;)Ljava/util/function/Function; ARG 0 color + METHOD m_vfpzuwtj register (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq; METHOD m_wjfyifdb nonSolid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z diff --git a/mappings/net/minecraft/block/NyliumBlock.mapping b/mappings/net/minecraft/block/NyliumBlock.mapping index 0d0efac0fe..c9589ea74c 100644 --- a/mappings/net/minecraft/block/NyliumBlock.mapping +++ b/mappings/net/minecraft/block/NyliumBlock.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/unmapped/C_gtlslwea net/minecraft/block/NyliumBlock ARG 1 world ARG 2 pos METHOD m_ttognngs generate (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kgfalbim;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;)V + ARG 2 feature ARG 4 chunkGenerator METHOD m_vnwlqtjy (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kgfalbim;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V ARG 4 registryKeyHolder diff --git a/mappings/net/minecraft/block/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/TrialSpawnerConfig.mapping index b84741ad8b..80d6a63a20 100644 --- a/mappings/net/minecraft/block/TrialSpawnerConfig.mapping +++ b/mappings/net/minecraft/block/TrialSpawnerConfig.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/unmapped/C_pocjjnjk net/minecraft/block/TrialSpawnerConfig + FIELD f_mqsazqov HOLDER_CODEC Lcom/mojang/serialization/Codec; + FIELD f_vbllmfpg CODEC Lcom/mojang/serialization/Codec; FIELD f_ykrjgiui DEFAULT_INSTANCE Lnet/minecraft/unmapped/C_pocjjnjk; + METHOD m_akovexzz builder ()Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; METHOD m_fsslncbi getSimultaneousMobs (I)I ARG 1 additionalPlayers METHOD m_rjwfxsix getCooldown ()J @@ -7,3 +10,32 @@ CLASS net/minecraft/unmapped/C_pocjjnjk net/minecraft/block/TrialSpawnerConfig ARG 1 additionalPlayers METHOD m_wydezwto (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + CLASS C_vnrwaphu Builder + FIELD f_grofsmmd simultaneousMobs F + FIELD f_gurbcovz lootTablesToEject Lnet/minecraft/unmapped/C_owfsqzhr; + FIELD f_jgjwrvli spawnPotentialsDefinition Lnet/minecraft/unmapped/C_owfsqzhr; + FIELD f_jgmutzza ticksBetweenSpawn I + FIELD f_jqtdptyp simultaneousMobsAddedPerPlayer F + FIELD f_nblcrtjb totalMobsAddedPerPlayer F + FIELD f_reubvwnb itemsToDropWhenOminous Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_tmgwtcsf spawnRange I + FIELD f_vfxijlzt totalMobs F + METHOD m_atarftzm spawnPotentialDefinition (Lnet/minecraft/unmapped/C_owfsqzhr;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 definition + METHOD m_bdhifmhg spawnRange (I)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 range + METHOD m_cappnuim totalMobs (F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 total + METHOD m_djzmjbrp itemsToDropWhenOminous (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 items + METHOD m_eqnyjcak simultaneousMobsAddedPerPlayer (F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 simultaneous + METHOD m_kavdpwjp ticksBetweenSpawn (I)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 ticks + METHOD m_oindwyhl lootTablesToEject (Lnet/minecraft/unmapped/C_owfsqzhr;)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 lootTables + METHOD m_rmwakhzj totalMobsAddedPerPlayer (F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 total + METHOD m_uitredfl build ()Lnet/minecraft/unmapped/C_pocjjnjk; + METHOD m_ukbjwlwe simultaneousMobs (F)Lnet/minecraft/unmapped/C_pocjjnjk$C_vnrwaphu; + ARG 1 simultaneus diff --git a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping index 1936acb477..aedee9abef 100644 --- a/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BrushableBlockEntity.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/unmapped/C_tlzeicbt net/minecraft/block/entity/BrushableBloc FIELD f_ujqpfzjx cooldownEndTick J FIELD f_ukyicdib LOGGER Lorg/slf4j/Logger; FIELD f_wltskfrl hitDirection Lnet/minecraft/unmapped/C_xpuuihxf; - FIELD f_xskjyxrz lootTableId Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_xskjyxrz lootTable Lnet/minecraft/unmapped/C_xhhleach; METHOD (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V ARG 1 pos ARG 2 state @@ -27,6 +27,7 @@ CLASS net/minecraft/unmapped/C_tlzeicbt net/minecraft/block/entity/BrushableBloc METHOD m_kfybgynf checkLootInteraction (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 2 player METHOD m_llghgzmo setLootTable (Lnet/minecraft/unmapped/C_xhhleach;J)V + ARG 1 lootTable ARG 2 lootTableSeed METHOD m_otxeysvo getHitDirection ()Lnet/minecraft/unmapped/C_xpuuihxf; METHOD m_ozsgysbr serializeLootTable (Lnet/minecraft/unmapped/C_hhlwcnih;)Z diff --git a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping index 7841a34c03..e8d3f34351 100644 --- a/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/DecoratedPotBlockEntity.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/unmapped/C_snnddtnv net/minecraft/block/entity/DecoratedPotBlockEntity FIELD f_bsjlvxwm lastWobbleTime J - FIELD f_dwwkwusv lootTableId Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_dwwkwusv lootTable Lnet/minecraft/unmapped/C_xhhleach; FIELD f_hmmflmll ITEM_KEY Ljava/lang/String; FIELD f_lkaissqj SHERDS_KEY Ljava/lang/String; FIELD f_ntlmymra sherds Lnet/minecraft/unmapped/C_cpmlbyix; diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index 5001a0a6fe..85dc7c0e27 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/unmapped/C_awquuxeb net/minecraft/block/entity/LootableContainerBlockEntity - FIELD f_jpgmzqwu lootTableId Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_jpgmzqwu lootTable Lnet/minecraft/unmapped/C_xhhleach; FIELD f_tbxnycjm lootTableSeed J diff --git a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping index 30a4b0b076..c1bf6abd39 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CreateWorldScreen.mapping @@ -41,6 +41,8 @@ CLASS net/minecraft/unmapped/C_ibkofvzc net/minecraft/client/gui/screen/world/Cr ARG 1 debugWorld METHOD m_fqtykenm clearDataPackTempDir ()V METHOD m_fsncvugn createStorageSession (Lnet/minecraft/unmapped/C_ayfeobid;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/util/Optional; + METHOD m_hrmwcpge (Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_wrmtlwqx;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_zugbgokk;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vuympcpz;)V + ARG 4 generatorType METHOD m_kfiwihuq copyDataPack (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V ARG 0 srcFolder ARG 1 destFolder diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index d00145c709..41ab4c5b33 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -82,6 +82,8 @@ CLASS net/minecraft/unmapped/C_nuofrxvi net/minecraft/client/network/ClientPlayN METHOD m_rfxuxjoo isEnabled (Lnet/minecraft/unmapped/C_czxxrbcp;)Z ARG 1 flags METHOD m_rgltuuxs clearWorld ()V + METHOD m_rqcfgrmg (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl;)Lnet/minecraft/unmapped/C_tqxyjqsk$C_dbbudibo; + ARG 1 registry METHOD m_twqcihtd getPlayerList ()Ljava/util/Collection; METHOD m_uccwwurs getServerInfo ()Lnet/minecraft/unmapped/C_xotldzgg; METHOD m_ugyspzmn scheduleChunkRender (Lnet/minecraft/unmapped/C_hrdsvlkq;II)V diff --git a/mappings/net/minecraft/client/option/AttackIndicator.mapping b/mappings/net/minecraft/client/option/AttackIndicator.mapping index b9cdf597fb..41c6af0ca6 100644 --- a/mappings/net/minecraft/client/option/AttackIndicator.mapping +++ b/mappings/net/minecraft/client/option/AttackIndicator.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/unmapped/C_qkksfeqi net/minecraft/client/option/AttackIndicator - FIELD f_biuwndyo VALUES Ljava/util/function/IntFunction; + FIELD f_biuwndyo BY_ID Ljava/util/function/IntFunction; FIELD f_kksyusdx translationKey Ljava/lang/String; FIELD f_ybcrnvze id I - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 translationKey METHOD m_yqosuiuc byId (I)Lnet/minecraft/unmapped/C_qkksfeqi; ARG 0 id diff --git a/mappings/net/minecraft/client/option/ChatVisibility.mapping b/mappings/net/minecraft/client/option/ChatVisibility.mapping index 378b5f8472..85a6e62a05 100644 --- a/mappings/net/minecraft/client/option/ChatVisibility.mapping +++ b/mappings/net/minecraft/client/option/ChatVisibility.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/unmapped/C_wafwmsvb net/minecraft/client/option/ChatVisibility FIELD f_ynbcgkjh translationKey Ljava/lang/String; - FIELD f_zqqalhdk VALUES Ljava/util/function/IntFunction; + FIELD f_zqqalhdk BY_ID Ljava/util/function/IntFunction; FIELD f_zzwzstvf id I - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 translationKey METHOD m_buntzssc byId (I)Lnet/minecraft/unmapped/C_wafwmsvb; ARG 0 id diff --git a/mappings/net/minecraft/client/option/ChunkUpdatesPrioritization.mapping b/mappings/net/minecraft/client/option/ChunkUpdatesPrioritization.mapping index 0b76d14c07..2dad215f02 100644 --- a/mappings/net/minecraft/client/option/ChunkUpdatesPrioritization.mapping +++ b/mappings/net/minecraft/client/option/ChunkUpdatesPrioritization.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/unmapped/C_acpywlie net/minecraft/client/option/ChunkUpdatesPrioritization - FIELD f_quwymauq VALUES Ljava/util/function/IntFunction; + FIELD f_quwymauq BY_ID Ljava/util/function/IntFunction; FIELD f_urchaypp id I FIELD f_yuybyesd translationKey Ljava/lang/String; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 translationKey - METHOD m_azahvtif fromId (I)Lnet/minecraft/unmapped/C_acpywlie; + METHOD m_azahvtif byId (I)Lnet/minecraft/unmapped/C_acpywlie; ARG 0 id diff --git a/mappings/net/minecraft/client/option/GraphicsMode.mapping b/mappings/net/minecraft/client/option/GraphicsMode.mapping index 0ea62abe97..20bc1be4f8 100644 --- a/mappings/net/minecraft/client/option/GraphicsMode.mapping +++ b/mappings/net/minecraft/client/option/GraphicsMode.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/unmapped/C_inrattee net/minecraft/client/option/GraphicsMode FIELD f_hyeaecff id I - FIELD f_tpfeaisz VALUES Ljava/util/function/IntFunction; + FIELD f_tpfeaisz BY_ID Ljava/util/function/IntFunction; FIELD f_uqbjoxlo translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id ARG 4 translationKey METHOD m_xuzenwat byId (I)Lnet/minecraft/unmapped/C_inrattee; ARG 0 id diff --git a/mappings/net/minecraft/client/option/NarratorMode.mapping b/mappings/net/minecraft/client/option/NarratorMode.mapping index a80e4dbfa6..83e611b250 100644 --- a/mappings/net/minecraft/client/option/NarratorMode.mapping +++ b/mappings/net/minecraft/client/option/NarratorMode.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/unmapped/C_ekczyczh net/minecraft/client/option/NarratorMode FIELD f_gborsyql name Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_nikdsyso id I - FIELD f_qtvfmgny VALUES Ljava/util/function/IntFunction; + FIELD f_qtvfmgny BY_ID Ljava/util/function/IntFunction; METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name + ARG 4 translationKey METHOD m_cbrezehp getName ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_gifirmom canNarrateChat ()Z METHOD m_sxeyqcgh canNarrateSystemMessages ()Z diff --git a/mappings/net/minecraft/client/option/ParticlesMode.mapping b/mappings/net/minecraft/client/option/ParticlesMode.mapping index cc3f123896..19511c00fa 100644 --- a/mappings/net/minecraft/client/option/ParticlesMode.mapping +++ b/mappings/net/minecraft/client/option/ParticlesMode.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/unmapped/C_ohzhuhsr net/minecraft/client/option/ParticlesMode FIELD f_qjewekah id I FIELD f_ropuplfq translationKey Ljava/lang/String; - FIELD f_zkrtmlae VALUES Ljava/util/function/IntFunction; + FIELD f_zkrtmlae BY_ID Ljava/util/function/IntFunction; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 translationKey diff --git a/mappings/net/minecraft/client/realms/RealmsWorldGeneratorType.mapping b/mappings/net/minecraft/client/realms/RealmsWorldGeneratorType.mapping index f87a74c4f6..b4d61c36c4 100644 --- a/mappings/net/minecraft/client/realms/RealmsWorldGeneratorType.mapping +++ b/mappings/net/minecraft/client/realms/RealmsWorldGeneratorType.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/unmapped/C_oynhlvsg net/minecraft/client/realms/RealmsWorldGeneratorType FIELD f_cbggqyed text Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_xrjjnqsd id I + METHOD (Ljava/lang/String;IILnet/minecraft/unmapped/C_xhhleach;)V + ARG 4 type METHOD m_anzslqqw getText ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_pylejpes getId ()I diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index 6fccfd1331..a30c4284ec 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -38,6 +38,7 @@ CLASS net/minecraft/unmapped/C_vkaoetfp net/minecraft/client/render/TexturedRend METHOD m_ealwunls createHangingSignTextureId (Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky; ARG 0 type METHOD m_eqczrmay getDecoratedPotPatternTextureId (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_djlixbky; + ARG 0 pattern METHOD m_ezczexcd getHangingSignTextureId (Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky; ARG 0 type METHOD m_fqmfsjlg (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lnet/minecraft/unmapped/C_djlixbky; diff --git a/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping index 75e58775fb..7d70a52598 100644 --- a/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/StructureDebugRenderer.mapping @@ -5,6 +5,11 @@ CLASS net/minecraft/unmapped/C_jneftvkt net/minecraft/client/render/debug/Struct FIELD f_wttkajig client Lnet/minecraft/unmapped/C_ayfeobid; METHOD (Lnet/minecraft/unmapped/C_ayfeobid;)V ARG 1 client + METHOD m_ssusrqxe (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Map; + ARG 0 unused METHOD m_tmeqhmbo addStructure (Lnet/minecraft/unmapped/C_hmqypqzz;Ljava/util/List;Lnet/minecraft/unmapped/C_xhhleach;)V ARG 1 boundingBox ARG 2 piecesBoundingBoxes + ARG 3 world + METHOD m_zccwebay (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Map; + ARG 0 unused diff --git a/mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping b/mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping index baa9af5938..b2441cf0b4 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelTransformationMode.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/unmapped/C_byhguelf net/minecraft/client/render/model/json/ModelTransformationMode - FIELD f_igynifqz value B + FIELD f_igynifqz id B FIELD f_kuzfhjos CODEC Lcom/mojang/serialization/Codec; - FIELD f_yltbiwcl id Ljava/lang/String; - FIELD f_zrsebbru FROM_VALUE Ljava/util/function/IntFunction; + FIELD f_yltbiwcl name Ljava/lang/String; + FIELD f_zrsebbru BY_ID Ljava/util/function/IntFunction; METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 value - ARG 4 id + ARG 3 id METHOD m_rvndgijr getValue ()B METHOD m_vdlyrqxg isFirstPerson ()Z diff --git a/mappings/net/minecraft/command/CommandBuildContext.mapping b/mappings/net/minecraft/command/CommandBuildContext.mapping index 356abf4e1b..95e27f8f8f 100644 --- a/mappings/net/minecraft/command/CommandBuildContext.mapping +++ b/mappings/net/minecraft/command/CommandBuildContext.mapping @@ -2,3 +2,7 @@ CLASS net/minecraft/unmapped/C_bprdujxm net/minecraft/command/CommandBuildContex METHOD m_mhsgrguo createSimple (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_bprdujxm; ARG 0 provider ARG 1 featureFlags + METHOD m_vlrtrrnf getFeatureFlags ()Lnet/minecraft/unmapped/C_czxxrbcp; + CLASS C_crxxacwy + METHOD m_hoqhezld (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + ARG 1 lookup diff --git a/mappings/net/minecraft/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping index 2a263deba9..0594d1ebee 100644 --- a/mappings/net/minecraft/command/CommandSource.mapping +++ b/mappings/net/minecraft/command/CommandSource.mapping @@ -9,12 +9,16 @@ CLASS net/minecraft/unmapped/C_sasfholk net/minecraft/command/CommandSource ARG 2 identifier ARG 3 tooltip METHOD m_fjnhrcro getEnabledFlags ()Lnet/minecraft/unmapped/C_czxxrbcp; + METHOD m_gahgxanj (Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 tag METHOD m_gmcggpep suggestMatching (Ljava/util/stream/Stream;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 stream + ARG 0 suggestions ARG 1 builder METHOD m_hfcwokxp matchesSubString (Ljava/lang/String;Ljava/lang/String;)Z ARG 0 string ARG 1 string2 + METHOD m_hyyvvigx (Ljava/lang/String;Ljava/lang/String;)Z + ARG 1 suggestion METHOD m_ifeviymy getEntitySuggestions ()Ljava/util/Collection; METHOD m_ifzcfard suggestRegistryElements (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_sasfholk$C_yjlyniph;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V ARG 1 registry @@ -66,7 +70,7 @@ CLASS net/minecraft/unmapped/C_sasfholk net/minecraft/command/CommandSource METHOD m_upznzolz hasPermission (I)Z ARG 1 level METHOD m_uzuaopkd suggestRegistryElements (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_sasfholk$C_yjlyniph;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/concurrent/CompletableFuture; - ARG 1 key + ARG 1 registry ARG 2 suggestionType ARG 3 builder ARG 4 context @@ -76,6 +80,8 @@ CLASS net/minecraft/unmapped/C_sasfholk net/minecraft/command/CommandSource ARG 2 string2 ARG 3 identifier ARG 4 action + METHOD m_wsgsplgw (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)V + ARG 3 message METHOD m_xphjtijn suggestResource (Ljava/util/stream/Stream;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 0 identifierStream ARG 1 builder diff --git a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping index 0957118746..a4496af35d 100644 --- a/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/RegistryEntryArgumentType.mapping @@ -52,3 +52,4 @@ CLASS net/minecraft/unmapped/C_mymnmzsx net/minecraft/command/argument/RegistryE ARG 1 reader CLASS C_ipydwopz TypeInfo CLASS C_bgcoghfg Template + FIELD f_ruebpfes registry Lnet/minecraft/unmapped/C_xhhleach; diff --git a/mappings/net/minecraft/command/argument/RegistryEntryOrTagArgument.mapping b/mappings/net/minecraft/command/argument/RegistryEntryOrTagArgument.mapping index a7e121e5b6..f00ca1e76b 100644 --- a/mappings/net/minecraft/command/argument/RegistryEntryOrTagArgument.mapping +++ b/mappings/net/minecraft/command/argument/RegistryEntryOrTagArgument.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_bwiwqfgl net/minecraft/command/argument/RegistryEntryOrTagArgument FIELD f_askxyhwf NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; FIELD f_mtetdrqd INVALID_TAG_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; + FIELD f_nbxmxsnf registry Lnet/minecraft/unmapped/C_xhhleach; FIELD f_ptsdazkt EXAMPLES Ljava/util/Collection; FIELD f_zyyamqsa lookup Lnet/minecraft/unmapped/C_vtbxyypo; METHOD (Lnet/minecraft/unmapped/C_bprdujxm;Lnet/minecraft/unmapped/C_xhhleach;)V @@ -14,6 +15,7 @@ CLASS net/minecraft/unmapped/C_bwiwqfgl net/minecraft/command/argument/RegistryE ARG 2 o3 METHOD m_kfwauvon create (Lnet/minecraft/unmapped/C_bprdujxm;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_bwiwqfgl; ARG 0 context + ARG 1 registry METHOD m_pqzvsbvc (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 o ARG 1 o2 @@ -22,6 +24,7 @@ CLASS net/minecraft/unmapped/C_bwiwqfgl net/minecraft/command/argument/RegistryE METHOD m_vnamvtuc getResult (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_bwiwqfgl$C_vxeoztnt; ARG 0 context ARG 1 name + ARG 2 registry METHOD m_wilgrbfx (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; ARG 1 namedSet CLASS C_qkdcccvt HolderResult @@ -32,7 +35,9 @@ CLASS net/minecraft/unmapped/C_bwiwqfgl net/minecraft/command/argument/RegistryE ARG 1 holder CLASS C_vxeoztnt Result METHOD m_lkvgzdgo castTo (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 registry METHOD m_wnaoukry getStringRepresentation ()Ljava/lang/String; METHOD m_ylqwzoow getResultValue ()Lcom/mojang/datafixers/util/Either; CLASS C_yhjqhzlk Info CLASS C_itwjidak Template + FIELD f_qzhhszwx registry Lnet/minecraft/unmapped/C_xhhleach; diff --git a/mappings/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.mapping b/mappings/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.mapping index d745495a7a..e4adb4f8a3 100644 --- a/mappings/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.mapping +++ b/mappings/net/minecraft/command/argument/RegistryKeyOrTagKeyResult.mapping @@ -1,22 +1,27 @@ CLASS net/minecraft/unmapped/C_ybgoyqmh net/minecraft/command/argument/RegistryKeyOrTagKeyResult FIELD f_idfywblo EXAMPLES Ljava/util/Collection; + FIELD f_zqlvjvdr registry Lnet/minecraft/unmapped/C_xhhleach; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder METHOD m_smfremsu getResult (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/unmapped/C_ybgoyqmh$C_rckobmqr; ARG 0 context ARG 1 name + ARG 2 registry ARG 3 exception METHOD m_tvljewfq create (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ybgoyqmh; + ARG 0 registry CLASS C_gecdolwz RegistryKeyResult METHOD test (Ljava/lang/Object;)Z ARG 1 holder CLASS C_mdlaqxgp Info CLASS C_lwhxrgaj Template + FIELD f_osltangg registry Lnet/minecraft/unmapped/C_xhhleach; CLASS C_rckobmqr Result METHOD m_plvjoeqs getResultValue ()Lcom/mojang/datafixers/util/Either; METHOD m_uysvgqki getStringRepresentation ()Ljava/lang/String; METHOD m_ynmuoeuc castTo (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 registry CLASS C_yxbswysv TagResult METHOD test (Ljava/lang/Object;)Z ARG 1 holder diff --git a/mappings/net/minecraft/command/argument/ResourceKeyArgument.mapping b/mappings/net/minecraft/command/argument/ResourceKeyArgument.mapping index 1b1e12962d..aac7a04d8d 100644 --- a/mappings/net/minecraft/command/argument/ResourceKeyArgument.mapping +++ b/mappings/net/minecraft/command/argument/ResourceKeyArgument.mapping @@ -3,14 +3,11 @@ CLASS net/minecraft/unmapped/C_zgptntbw net/minecraft/command/argument/ResourceK FIELD f_fmnxgqhj INVALID_FEATURE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD f_hqteeflf INVALID_JIGSAW_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD f_nufqqyoc EXAMPLES Ljava/util/Collection; - FIELD f_umcxcanc key Lnet/minecraft/unmapped/C_xhhleach; - METHOD (Lnet/minecraft/unmapped/C_xhhleach;)V - ARG 1 key + FIELD f_umcxcanc registry Lnet/minecraft/unmapped/C_xhhleach; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 suggestionsBuilder - METHOD m_cjqstqop key (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_zgptntbw; - ARG 0 key + METHOD m_cjqstqop of (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_zgptntbw; METHOD m_ezsbrgup getStructure (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 0 context ARG 1 name @@ -26,6 +23,7 @@ CLASS net/minecraft/unmapped/C_zgptntbw net/minecraft/command/argument/ResourceK METHOD m_tvftiixn get (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 0 context ARG 1 id + ARG 2 registry ARG 3 exception METHOD m_uejwwoio getKey (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;)Lnet/minecraft/unmapped/C_xhhleach; ARG 0 context @@ -41,6 +39,4 @@ CLASS net/minecraft/unmapped/C_zgptntbw net/minecraft/command/argument/ResourceK ARG 1 stringReader CLASS C_rxslkdgr Info CLASS C_ectbtsuu Template - FIELD f_dtzjoigc key Lnet/minecraft/unmapped/C_xhhleach; - METHOD (Lnet/minecraft/unmapped/C_zgptntbw$C_rxslkdgr;Lnet/minecraft/unmapped/C_xhhleach;)V - ARG 2 key + FIELD f_dtzjoigc registry Lnet/minecraft/unmapped/C_xhhleach; diff --git a/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping b/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping index 2d4e998fc7..45e79c9079 100644 --- a/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping +++ b/mappings/net/minecraft/component/type/FireworkExplosionComponent.mapping @@ -21,6 +21,6 @@ CLASS net/minecraft/unmapped/C_ibwugxba net/minecraft/component/type/FireworkExp FIELD f_oukclydd id I FIELD f_pkqbkpww name Ljava/lang/String; METHOD m_msqymlvt getName ()Lnet/minecraft/unmapped/C_npqneive; - METHOD m_pkleuvpj fromId (I)Lnet/minecraft/unmapped/C_ibwugxba$C_zzjguyly; + METHOD m_pkleuvpj byId (I)Lnet/minecraft/unmapped/C_ibwugxba$C_zzjguyly; ARG 0 id METHOD m_wewhqujo getId ()I diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping index 280ef1c078..84571ea295 100644 --- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/unmapped/C_qlclfxvn net/minecraft/component/type/ItemEnchant ARG 0 component METHOD m_rwfsmcfy getTagOrEmpty (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_odfnijdo; ARG 0 lookup - ARG 2 tag + ARG 1 registry METHOD m_szyctegw getEnchantmentEntries ()Ljava/util/Set; COMMENT @return a map with enchantments as keys and their levels as values METHOD m_ucwxfcxd withShownInTooltip (Z)Lnet/minecraft/unmapped/C_qlclfxvn; diff --git a/mappings/net/minecraft/data/DataPackOutput.mapping b/mappings/net/minecraft/data/DataPackOutput.mapping index 8b4f37506d..ed5d034ba9 100644 --- a/mappings/net/minecraft/data/DataPackOutput.mapping +++ b/mappings/net/minecraft/data/DataPackOutput.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/unmapped/C_ugkmwocs net/minecraft/data/DataPackOutput METHOD m_cjbwdafm createPathResolver (Lnet/minecraft/unmapped/C_ugkmwocs$C_rvdkgcbb;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc; ARG 1 type ARG 2 directoryName + METHOD m_cxqnkpjt createTagPathResolver (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc; + METHOD m_jgqgnctt createPathResolver (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc; METHOD m_tciarwch resolvePath (Lnet/minecraft/unmapped/C_ugkmwocs$C_rvdkgcbb;)Ljava/nio/file/Path; ARG 1 outputType METHOD m_vozigwpe getPath ()Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/data/DataPackStructureProvider.mapping b/mappings/net/minecraft/data/DataPackStructureProvider.mapping new file mode 100644 index 0000000000..36daa33c8f --- /dev/null +++ b/mappings/net/minecraft/data/DataPackStructureProvider.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_nnkntxbt net/minecraft/data/DataPackStructureProvider + METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;)V + ARG 1 output diff --git a/mappings/net/minecraft/data/DataProvider.mapping b/mappings/net/minecraft/data/DataProvider.mapping index 9a2b684655..73f69b1c48 100644 --- a/mappings/net/minecraft/data/DataProvider.mapping +++ b/mappings/net/minecraft/data/DataProvider.mapping @@ -6,7 +6,11 @@ CLASS net/minecraft/unmapped/C_nyiqvxcn net/minecraft/data/DataProvider ARG 0 writer ARG 1 json ARG 2 path - METHOD m_fafjrzdp getName ()Ljava/lang/String; + METHOD m_fafjrzdp getDescription ()Ljava/lang/String; + COMMENT @return a unique description of this provider; + COMMENT adding multiple providers with the same description to a + COMMENT {@link net.minecraft.data.DataGenerator.PackGenerator generator} + COMMENT will cause an exception 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/EquipmentModelDefinitionsProvider.mapping b/mappings/net/minecraft/data/EquipmentModelDefinitionsProvider.mapping new file mode 100644 index 0000000000..c4ceb0c75f --- /dev/null +++ b/mappings/net/minecraft/data/EquipmentModelDefinitionsProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_vsteyhwp net/minecraft/data/EquipmentModelDefinitionsProvider diff --git a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping index dd27893924..d23b089529 100644 --- a/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping +++ b/mappings/net/minecraft/data/report/BiomeParametersProvider.mapping @@ -2,14 +2,20 @@ CLASS net/minecraft/unmapped/C_wwetinhi net/minecraft/data/report/BiomeParameter FIELD f_bemjvqoj path Ljava/nio/file/Path; FIELD f_iubheypa ENTRY_CODEC Lcom/mojang/serialization/MapCodec; FIELD f_tjqcsbiq CODEC Lcom/mojang/serialization/Codec; - FIELD f_zrxygubc lookupProvider Ljava/util/concurrent/CompletableFuture; + FIELD f_zrxygubc lookupProviderFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output - ARG 2 lookupProvider + METHOD m_afadrwym (Ljava/nio/file/Path;Ljava/lang/String;)V + ARG 1 errorMessage METHOD m_dbdhbfat write (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; ARG 0 path ARG 1 writer ARG 3 encoder ARG 4 object + METHOD m_hcgtptww (Ljava/util/List;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr;Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;)V + ARG 4 preset + ARG 5 biome METHOD m_lfeplmtj resolveFile (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/nio/file/Path; ARG 1 id + METHOD m_wrnliuob (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage; + ARG 2 provider diff --git a/mappings/net/minecraft/data/server/LootTablesProvider.mapping b/mappings/net/minecraft/data/server/LootTablesProvider.mapping index d4a0cc3ff9..c360a91d75 100644 --- a/mappings/net/minecraft/data/server/LootTablesProvider.mapping +++ b/mappings/net/minecraft/data/server/LootTablesProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/unmapped/C_rriyyrek net/minecraft/data/server/LootTablesProvider - FIELD f_hwfthond lootTableProviderFuture Ljava/util/concurrent/CompletableFuture; + FIELD f_hwfthond lookupProviderFuture Ljava/util/concurrent/CompletableFuture; FIELD f_khsnzwsn lootTypeGenerators Ljava/util/List; FIELD f_umgzdmcg LOGGER Lorg/slf4j/Logger; FIELD f_xcjyrvon lootTableIds Ljava/util/Set; @@ -8,6 +8,17 @@ CLASS net/minecraft/unmapped/C_rriyyrek net/minecraft/data/server/LootTablesProv ARG 1 dataPackOutput METHOD m_cvuljxmh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletableFuture; ARG 1 writer + ARG 2 lookupProvider + METHOD m_iccnzkqh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage; + ARG 2 provider + METHOD m_pkqhglxx (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/Map;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;)V + ARG 3 generator + METHOD m_ttdjbgbz getId (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 lootTable METHOD m_wtovnwug (Ljava/util/Map;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V ARG 1 entry + ARG 3 lootTable + ARG 4 builder CLASS C_ujsjtlmo GeneratorEntry + FIELD f_lwflnqtz factory Ljava/util/function/Function; + METHOD m_zehwvskp factory ()Ljava/util/function/Function; diff --git a/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping index 3a8a6f0f3d..edc5b14746 100644 --- a/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping @@ -5,6 +5,13 @@ CLASS net/minecraft/unmapped/C_egeqzyvk net/minecraft/data/server/loot_table/Ent METHOD m_dmtatuce frogDamageSource (Lnet/minecraft/unmapped/C_pzdchrcy;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; METHOD m_ltaoqnev generate ()V METHOD m_nxkzkqkr putLootTable (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V - ARG 1 type ARG 2 builder + METHOD m_rtklupeh (Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/util/Map; + ARG 0 unused METHOD m_vtkdidok variantSpecificFrogDamageSource (Lnet/minecraft/unmapped/C_pzdchrcy;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; + ARG 1 typeProvider + ARG 2 variant + METHOD m_znlvnkkb putLootTable (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V + ARG 1 type + ARG 2 lootTable + ARG 3 builder diff --git a/mappings/net/minecraft/data/server/loot_table/LootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/LootTableGenerator.mapping index 9a181c544b..516760c328 100644 --- a/mappings/net/minecraft/data/server/loot_table/LootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loot_table/LootTableGenerator.mapping @@ -1 +1,3 @@ CLASS net/minecraft/unmapped/C_ujnowvgu net/minecraft/data/server/loot_table/LootTableGenerator + METHOD generate (Ljava/util/function/BiConsumer;)V + ARG 1 lootModifier diff --git a/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping index d57db25c6b..127a5a628a 100644 --- a/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/unmapped/C_zqlavbep net/minecraft/data/server/tag/AbstractTagProvider FIELD f_bjnzkozm registryLoadFuture Ljava/util/concurrent/CompletableFuture; FIELD f_dkneixhd pathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc; - FIELD f_geosnnbu key Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_geosnnbu registry Lnet/minecraft/unmapped/C_xhhleach; FIELD f_lubzhdwr tagBuilders Ljava/util/Map; FIELD f_oiajybif tagLookupFuture Ljava/util/concurrent/CompletableFuture; FIELD f_ppduqpro registryLookupFuture Ljava/util/concurrent/CompletableFuture; @@ -14,7 +14,6 @@ CLASS net/minecraft/unmapped/C_zqlavbep net/minecraft/data/server/tag/AbstractTa METHOD m_bitbfodv configure (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V ARG 1 lookup METHOD m_dvcyjzus getOrCreateTagBuilder (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; - ARG 1 key METHOD m_hwoaobva getTagLookupFuture ()Ljava/util/concurrent/CompletableFuture; METHOD m_kjuqqirx getTagBuilder (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_dgpijqhe; ARG 1 key @@ -23,22 +22,19 @@ CLASS net/minecraft/unmapped/C_zqlavbep net/minecraft/data/server/tag/AbstractTa ARG 1 tagKey METHOD m_zoqfcozb (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; ARG 1 lookupProvider - CLASS C_gojihseq ObjectBuilder + CLASS C_gojihseq ElementAdder FIELD f_iepclmzl builder Lnet/minecraft/unmapped/C_dgpijqhe; METHOD (Lnet/minecraft/unmapped/C_dgpijqhe;)V ARG 1 builder METHOD m_ctewvair addOptional (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; - ARG 1 id METHOD m_cxnarzaz addTag (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; - ARG 1 key - METHOD m_mpsppbyn add (Ljava/util/List;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; - ARG 1 keys + METHOD m_mpsppbyn addAll (Ljava/util/List;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; + ARG 1 elements METHOD m_nrwqjpbz add (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; - ARG 1 key + ARG 1 element METHOD m_nvcvrjhp addOptionalTag (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; - ARG 1 id - METHOD m_qserlndq add ([Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; - ARG 1 keys + METHOD m_qserlndq addAll ([Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_zqlavbep$C_gojihseq; + ARG 1 elements CLASS C_wyxvvqqq TagLookup METHOD contains (Lnet/minecraft/unmapped/C_ednuhnnn;)Z ARG 1 key diff --git a/mappings/net/minecraft/data/server/tag/TagsProvider.mapping b/mappings/net/minecraft/data/server/tag/TagsProvider.mapping index 410d00677d..95abc69bfa 100644 --- a/mappings/net/minecraft/data/server/tag/TagsProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagsProvider.mapping @@ -1,20 +1,10 @@ CLASS net/minecraft/unmapped/C_hzdskvsx net/minecraft/data/server/tag/TagsProvider - FIELD f_qpdypszd valueToKey Ljava/util/function/Function; - METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;)V - ARG 1 output - ARG 3 registryLookupFuture - ARG 4 tagLookupFuture - METHOD (Lnet/minecraft/unmapped/C_ugkmwocs;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Function;)V - ARG 1 output - ARG 2 key - ARG 3 lookupProvider - ARG 4 valueToKey - CLASS C_wosjfhof ObjectBuilder - FIELD f_dchldbph valueToKey Ljava/util/function/Function; + FIELD f_qpdypszd keyGetter Ljava/util/function/Function; + CLASS C_wosjfhof DirectElementAdder + FIELD f_dchldbph keyGetter Ljava/util/function/Function; METHOD (Lnet/minecraft/unmapped/C_dgpijqhe;Ljava/util/function/Function;)V ARG 1 builder - ARG 2 valueToKey METHOD m_agatuolp addAll ([Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof; - ARG 1 objects + ARG 1 elements METHOD m_bwfwpsfu add (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof; - ARG 1 object + ARG 1 element diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index 955792a8ec..ef2b1e3e08 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -100,6 +100,7 @@ CLASS net/minecraft/unmapped/C_jakrppis net/minecraft/enchantment/EnchantmentHel METHOD m_ruiicrds hasTag (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_ednuhnnn;)Z ARG 1 enchantment METHOD m_spmqbsrk enchantFromProvider (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_jiailwzt;Lnet/minecraft/unmapped/C_rlomrsco;)V + ARG 2 provider ARG 3 difficulty METHOD m_swhrpoib onEntityHitWithItem (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 0e1d8d9b97..1d3efc219b 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -391,7 +391,6 @@ CLASS net/minecraft/unmapped/C_astfners net/minecraft/entity/Entity METHOD m_huwcpczk canBeSpectated (Lnet/minecraft/unmapped/C_mxrobsgg;)Z ARG 1 spectator METHOD m_hvcwbybh startRiding (Lnet/minecraft/unmapped/C_astfners;Z)Z - ARG 1 entity ARG 2 force METHOD m_hvrxcdhf playSound (Lnet/minecraft/unmapped/C_avavozay;)V COMMENT Plays a given sound coming from this entity, if this entity is not silent diff --git a/mappings/net/minecraft/entity/EntityPose.mapping b/mappings/net/minecraft/entity/EntityPose.mapping index df70a1f460..1305f1da1d 100644 --- a/mappings/net/minecraft/entity/EntityPose.mapping +++ b/mappings/net/minecraft/entity/EntityPose.mapping @@ -2,6 +2,4 @@ CLASS net/minecraft/unmapped/C_ufdjspmk net/minecraft/entity/EntityPose FIELD f_drjcyate CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_iutbzuhu BY_ID Ljava/util/function/IntFunction; FIELD f_lpaujdpk id I - METHOD (Ljava/lang/String;II)V - ARG 3 id METHOD m_hbfckuwh getId ()I diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 221bf0a6da..2708a77c52 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -27,6 +27,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType COMMENT {@return whether this entity type is in the specified tag} ARG 1 tag COMMENT the entity type tag key + METHOD m_bwhasvfe createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; METHOD m_chqybydm isFireImmune ()Z METHOD m_djlonrdm isInvalidSpawn (Lnet/minecraft/unmapped/C_txtbiemp;)Z COMMENT Returns whether this entity type can spawn inside the given block. @@ -56,6 +57,8 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType ARG 3 player METHOD m_jwcfsqgu isSummonable ()Z METHOD m_kkusvlru isSpawnableFarFromPlayer ()Z + METHOD m_krlwdzbt register (Ljava/lang/String;Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;)Lnet/minecraft/unmapped/C_ogavsvbr; + ARG 1 builder METHOD m_lamxchjm isIn (Lnet/minecraft/unmapped/C_odfnijdo;)Z COMMENT {@return whether this item is in the specified holder set} ARG 1 set @@ -94,6 +97,9 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType COMMENT distance multiplier. METHOD m_wjaaowcn fromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Ljava/util/Optional; ARG 0 nbt + METHOD m_wpubgsdl register (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb;)Lnet/minecraft/unmapped/C_ogavsvbr; + ARG 0 type + ARG 1 builder METHOD m_znjphnxr getTranslationKey ()Ljava/lang/String; CLASS C_ddulqwnm METHOD tryAdvance (Ljava/util/function/Consumer;)Z @@ -137,6 +143,8 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType ARG 2 x ARG 3 y ARG 4 z + METHOD m_homqvsmf (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 0 lootTable METHOD m_itrwpmjb makeFireImmune ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; METHOD m_jqfjjilu requiredFlags ([Lnet/minecraft/unmapped/C_kksdgidr;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; ARG 1 flags @@ -149,6 +157,8 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType METHOD m_lxcabpka disableSummon ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; METHOD m_msevjhbv setSpawnDimensionsScale (F)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; ARG 1 scale + METHOD m_ncvdbohy (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/String; + ARG 0 type METHOD m_onnfrfmf spawnableFarFromPlayer ()Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; METHOD m_phyefhwa setEyeHeight (F)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; ARG 1 eyeHeight @@ -157,6 +167,7 @@ CLASS net/minecraft/unmapped/C_ogavsvbr net/minecraft/entity/EntityType ARG 0 spawnGroup METHOD m_tyhsjfkq vehicleAttachment (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; METHOD m_ukhgvcht build (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ogavsvbr; + ARG 1 type METHOD m_vwlaksox setAttachmentType (Lnet/minecraft/unmapped/C_biqpbxns;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_ogavsvbr$C_mopkbakb; ARG 1 attachmentType ARG 2 pos diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index 0a191ac20a..441dd7ab48 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -1,22 +1,25 @@ CLASS net/minecraft/unmapped/C_yuycoehb net/minecraft/entity/EquipmentSlot + FIELD f_exxszrbt VALUES Ljava/util/List; + FIELD f_fneaxvvq id I + FIELD f_ixynlylb BY_ID Ljava/util/function/IntFunction; FIELD f_navctjmp NO_MAX_COUNT I FIELD f_rwczokzq entityId I FIELD f_sxrtmuub type Lnet/minecraft/unmapped/C_yuycoehb$C_vkdieima; FIELD f_utijifsu maxCount I FIELD f_wotdkhkf CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; FIELD f_xlhfthzn name Ljava/lang/String; - METHOD (Ljava/lang/String;ILnet/minecraft/unmapped/C_yuycoehb$C_vkdieima;IILjava/lang/String;)V - ARG 3 type - ARG 4 entityId - ARG 5 armorStandId - ARG 6 name + METHOD m_bufirwcp getId ()I METHOD m_cypegoms split (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk; METHOD m_dmhyzohc getOffsetEntitySlotId (I)I ARG 1 offset METHOD m_egyjjxnq getType ()Lnet/minecraft/unmapped/C_yuycoehb$C_vkdieima; + METHOD m_fyvngtoz (Lnet/minecraft/unmapped/C_yuycoehb;)I + ARG 0 slot METHOD m_omjerill isArmorSlot ()Z METHOD m_ovklkqiy getName ()Ljava/lang/String; METHOD m_sybtfyce getEntitySlotId ()I + METHOD m_vgklquvo (Lnet/minecraft/unmapped/C_yuycoehb;)I + ARG 0 slot METHOD m_wjkdieuv byName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_yuycoehb; ARG 0 name CLASS C_vkdieima Type diff --git a/mappings/net/minecraft/entity/EquipmentSlotGroup.mapping b/mappings/net/minecraft/entity/EquipmentSlotGroup.mapping index f7c23d5b9d..e19fbc94b3 100644 --- a/mappings/net/minecraft/entity/EquipmentSlotGroup.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlotGroup.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/unmapped/C_qfoqahef net/minecraft/entity/EquipmentSlotGroup FIELD f_nhoyjwsw BY_ID Ljava/util/function/IntFunction; FIELD f_wvhciaue slotPredicate Ljava/util/function/Predicate; FIELD f_ybaxrurf id I - METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/util/function/Predicate;)V - ARG 3 id - ARG 4 name - ARG 5 slotPredicate METHOD (Ljava/lang/String;IILjava/lang/String;Lnet/minecraft/unmapped/C_yuycoehb;)V ARG 5 slot METHOD m_djnfswyg (Lnet/minecraft/unmapped/C_yuycoehb;)Z @@ -17,7 +13,7 @@ CLASS net/minecraft/unmapped/C_qfoqahef net/minecraft/entity/EquipmentSlotGroup ARG 0 slot METHOD m_toxnrdqq matches (Lnet/minecraft/unmapped/C_yuycoehb;)Z ARG 1 slot - METHOD m_tvkclilo get (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_qfoqahef; + METHOD m_tvkclilo bySlot (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_qfoqahef; ARG 0 slot METHOD m_uqnkvvet (Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_yuycoehb;)Z ARG 1 checkedSlot diff --git a/mappings/net/minecraft/entity/EquipmentUser.mapping b/mappings/net/minecraft/entity/EquipmentUser.mapping index 4593026a2f..514706e215 100644 --- a/mappings/net/minecraft/entity/EquipmentUser.mapping +++ b/mappings/net/minecraft/entity/EquipmentUser.mapping @@ -1,16 +1,17 @@ CLASS net/minecraft/unmapped/C_fxfvcivl net/minecraft/entity/EquipmentUser METHOD m_esnoggyp resolveSlot (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/List;)Lnet/minecraft/unmapped/C_yuycoehb; ARG 2 filledSlots - METHOD m_jcbansoq equip (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nzsnkdtl;JLjava/util/Map;)V + METHOD m_jcbansoq equipRandomly (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nzsnkdtl;JLjava/util/Map;)V + ARG 1 lootTable ARG 5 dropChances - METHOD m_mxaydhis equip (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nzsnkdtl;Ljava/util/Map;)V + METHOD m_mxaydhis equipRandomly (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nzsnkdtl;Ljava/util/Map;)V ARG 3 dropChances METHOD m_mywpdhns setDropChance (Lnet/minecraft/unmapped/C_yuycoehb;F)V ARG 1 slot ARG 2 chance METHOD m_udqbhpxg equipStack (Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V ARG 1 slot - METHOD m_ybivtegh equip (Lnet/minecraft/unmapped/C_fiwnwrrf;Lnet/minecraft/unmapped/C_nzsnkdtl;)V + METHOD m_ybivtegh equipRandomly (Lnet/minecraft/unmapped/C_fiwnwrrf;Lnet/minecraft/unmapped/C_nzsnkdtl;)V ARG 1 equipmentTable METHOD m_zwvabaox getEquippedStack (Lnet/minecraft/unmapped/C_yuycoehb;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 1 slot diff --git a/mappings/net/minecraft/entity/SpawnReason.mapping b/mappings/net/minecraft/entity/SpawnReason.mapping new file mode 100644 index 0000000000..1241e0b41c --- /dev/null +++ b/mappings/net/minecraft/entity/SpawnReason.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/unmapped/C_bhyaesep net/minecraft/entity/SpawnReason + METHOD m_vdamtufj ignoresBrightness (Lnet/minecraft/unmapped/C_bhyaesep;)Z + METHOD m_wwmgnuwp isSpawner (Lnet/minecraft/unmapped/C_bhyaesep;)Z diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index f2b09eedb4..472a4eaf70 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -21,7 +21,4 @@ CLASS net/minecraft/unmapped/C_hdbqsqsm net/minecraft/entity/attribute/EntityAtt FIELD f_umhgvzca PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_wzjuqzpc CODEC Lcom/mojang/serialization/Codec; FIELD f_ztrdibur name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;I)V - ARG 3 name - ARG 4 id METHOD m_tzqcenkk getId ()I diff --git a/mappings/net/minecraft/entity/damage/DamageSources.mapping b/mappings/net/minecraft/entity/damage/DamageSources.mapping index 14cf6a4d5a..aa55ba52b5 100644 --- a/mappings/net/minecraft/entity/damage/DamageSources.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSources.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/unmapped/C_lddxcbik net/minecraft/entity/damage/DamageSource FIELD f_lkntcxaf campfire Lnet/minecraft/unmapped/C_sbxfkpyv; FIELD f_lymlaaij generic Lnet/minecraft/unmapped/C_sbxfkpyv; FIELD f_mtnhkntq cactus Lnet/minecraft/unmapped/C_sbxfkpyv; + FIELD f_nessohrp enderPearl Lnet/minecraft/unmapped/C_sbxfkpyv; FIELD f_oletfyhq magic Lnet/minecraft/unmapped/C_sbxfkpyv; FIELD f_phxwvsfj flyIntoWall Lnet/minecraft/unmapped/C_sbxfkpyv; FIELD f_pnzgdzux dryOut Lnet/minecraft/unmapped/C_sbxfkpyv; @@ -43,12 +44,14 @@ CLASS net/minecraft/unmapped/C_lddxcbik net/minecraft/entity/damage/DamageSource METHOD m_givukkjp mobAttack (Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_sbxfkpyv; ARG 1 source METHOD m_gjkqlrqf create (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sbxfkpyv; + ARG 1 type ARG 2 source ARG 3 attacker METHOD m_graccxlk inWall ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_gxlltvwx trident (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sbxfkpyv; ARG 1 source ARG 2 attacker + METHOD m_hbfwzkfx maceSmash (Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_hvorlpuh magic ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_hzzqlhie fall ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_ievhzbek drown ()Lnet/minecraft/unmapped/C_sbxfkpyv; @@ -58,6 +61,7 @@ CLASS net/minecraft/unmapped/C_lddxcbik net/minecraft/entity/damage/DamageSource METHOD m_jqlpuaon lava ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_jrmiimzd hotFloor ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_jycgycwk create (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_sbxfkpyv; + ARG 1 type METHOD m_kciyglzx dryOut ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_kssiuuqu witherSkull (Lnet/minecraft/unmapped/C_vzureqzt;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sbxfkpyv; ARG 1 source @@ -88,6 +92,7 @@ CLASS net/minecraft/unmapped/C_lddxcbik net/minecraft/entity/damage/DamageSource ARG 2 attacker METHOD m_suzzcsxz cactus ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_tgffywka create (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sbxfkpyv; + ARG 1 type ARG 2 source METHOD m_vjirayfw badRespawnPoint (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_sbxfkpyv; ARG 1 pos @@ -104,6 +109,7 @@ CLASS net/minecraft/unmapped/C_lddxcbik net/minecraft/entity/damage/DamageSource METHOD m_xmiwmjzt thrown (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_sbxfkpyv; ARG 1 source ARG 2 attacker + METHOD m_yacirdqa enderPearl ()Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_yiditndb llamaSpit (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_yqxpxuxl windCharge (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_sbxfkpyv; METHOD m_zyuvjkhx flyIntoWall ()Lnet/minecraft/unmapped/C_sbxfkpyv; diff --git a/mappings/net/minecraft/entity/damage/DamageTypes.mapping b/mappings/net/minecraft/entity/damage/DamageTypes.mapping index aa787824e1..25cb62bccb 100644 --- a/mappings/net/minecraft/entity/damage/DamageTypes.mapping +++ b/mappings/net/minecraft/entity/damage/DamageTypes.mapping @@ -26,9 +26,11 @@ CLASS net/minecraft/unmapped/C_wshykkvq net/minecraft/entity/damage/DamageTypes FIELD f_nrpknljd LIGHTNING_BOLT Lnet/minecraft/unmapped/C_xhhleach; FIELD f_nucftlge FALL Lnet/minecraft/unmapped/C_xhhleach; FIELD f_nzxhitsm MOB_ATTACK_NO_AGGRO Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_obwbimdy MACE_SMASH Lnet/minecraft/unmapped/C_xhhleach; FIELD f_oguhsudb THROWN Lnet/minecraft/unmapped/C_xhhleach; FIELD f_otqfmynt CACTUS Lnet/minecraft/unmapped/C_xhhleach; FIELD f_padjadtl BAD_RESPAWN_POINT Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_pfdnywtp ENDER_PEARL Lnet/minecraft/unmapped/C_xhhleach; FIELD f_ppgtqcgn FLY_INTO_WALL Lnet/minecraft/unmapped/C_xhhleach; FIELD f_qcbxfpeo STING Lnet/minecraft/unmapped/C_xhhleach; FIELD f_sogkuuiy ON_FIRE Lnet/minecraft/unmapped/C_xhhleach; diff --git a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping index b57860e891..38b2778c4e 100644 --- a/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/DisplayEntity.mapping @@ -109,13 +109,10 @@ CLASS net/minecraft/unmapped/C_zdeutotk net/minecraft/entity/decoration/DisplayE ARG 1 f CLASS C_btdrhauy LinearFloatInterpolator CLASS C_cozbiatm BillboardRenderConstraints - FIELD f_afcfxjuf FROM_VALUE Ljava/util/function/IntFunction; - FIELD f_mexuxwrp value B - FIELD f_mfbouxff id Ljava/lang/String; - METHOD (Ljava/lang/String;IBLjava/lang/String;)V - ARG 3 value - ARG 4 id - METHOD m_vyfzsteo getValue ()B + FIELD f_afcfxjuf BY_ID Ljava/util/function/IntFunction; + FIELD f_mexuxwrp id B + FIELD f_mfbouxff name Ljava/lang/String; + METHOD m_vyfzsteo getId ()B CLASS C_cpnhprov BlockDisplayEntity FIELD f_hzopsxjm STATE Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_uixdfymz renderState Lnet/minecraft/unmapped/C_zdeutotk$C_cpnhprov$C_zhdrruye; diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingVariant.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingVariant.mapping index 6543da75de..deaf883207 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingVariant.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingVariant.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/unmapped/C_gbaxbrwg net/minecraft/entity/decoration/painting/PaintingVariant FIELD f_azsnvele DIRECT_CODEC Lcom/mojang/serialization/Codec; - FIELD f_bqduxiyq height I FIELD f_dfoybqqo CODEC Lcom/mojang/serialization/Codec; FIELD f_dkvvcxps PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_dtfxxovq DIRECT_PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; - FIELD f_snhuitee width I METHOD m_chqqbhoj (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD m_ghrmnkpe getArea ()I diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingVariants.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingVariants.mapping index 8d9e40d37f..acf64301c1 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingVariants.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingVariants.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/unmapped/C_xzjscbit net/minecraft/entity/decoration/painting/PaintingVariants METHOD m_avgpdivu createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; ARG 0 path + METHOD m_edfnafaz register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;IIZ)V + ARG 1 variant + ARG 2 width + ARG 3 height + ARG 4 hasAuthor + METHOD m_intyxvkf register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;II)V + ARG 1 variant METHOD m_wmijsric bootstrap (Lnet/minecraft/unmapped/C_hqoyyfco;)V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 4701195b50..7c1b44ed55 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -149,7 +149,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity METHOD m_swfiqufm prefersNewEquipment (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_yuycoehb;)Z ARG 1 newStack ARG 2 oldStack - METHOD m_szmqgzqm equip (Lnet/minecraft/unmapped/C_fiwnwrrf;)V + METHOD m_szmqgzqm equipRandomly (Lnet/minecraft/unmapped/C_fiwnwrrf;)V ARG 1 equipmentTable METHOD m_tjejbxzp canUseRangedWeapon (Lnet/minecraft/unmapped/C_axrfhndl;)Z ARG 1 weapon @@ -165,8 +165,8 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity ARG 2 penalty METHOD m_uazxcfcd updateEnchantments (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_jiailwzt;)V ARG 3 difficulty - METHOD m_uebjilbs equip (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/Map;)V - ARG 2 dropChances + METHOD m_uebjilbs equipRandomly (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/Map;)V + ARG 1 lootTable METHOD m_uqccedlq canSpawn (Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_bhyaesep;)Z ARG 1 world METHOD m_utndsklm equipBodyArmor (Lnet/minecraft/unmapped/C_sddaxwyk;)V diff --git a/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping b/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping index 1260c3fa5d..ac7811bcff 100644 --- a/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping @@ -20,12 +20,13 @@ CLASS net/minecraft/unmapped/C_fiyglykq net/minecraft/entity/mob/SpellcastingIll METHOD m_zttbpiyu getSpell ()Lnet/minecraft/unmapped/C_fiyglykq$C_rjdfyixx; CLASS C_rjdfyixx Spell FIELD f_aosxruav id I - FIELD f_wpzgaove FROM_ID Ljava/util/function/IntFunction; + FIELD f_wpzgaove BY_ID Ljava/util/function/IntFunction; FIELD f_yhkyqorl particleVelocity [D METHOD (Ljava/lang/String;IIDDD)V - ARG 3 id ARG 4 particleVelocityX ARG 6 particleVelocityY ARG 8 particleVelocityZ + METHOD m_aourikkx (Lnet/minecraft/unmapped/C_fiyglykq$C_rjdfyixx;)I + ARG 0 spell METHOD m_fligwgjx byId (I)Lnet/minecraft/unmapped/C_fiyglykq$C_rjdfyixx; ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index a15940f07f..76254c0814 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_tprvtfff net/minecraft/entity/passive/AnimalEntit METHOD m_bthblwno breed (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_tprvtfff;Lnet/minecraft/unmapped/C_jvojbnla;)V ARG 2 other ARG 3 child + METHOD m_crfaarku playEatSound ()V METHOD m_dzhrnghb (Lnet/minecraft/unmapped/C_tprvtfff;Lnet/minecraft/unmapped/C_jvojbnla;Lnet/minecraft/unmapped/C_mxrobsgg;)V ARG 3 player METHOD m_fficjzem isInLove ()Z diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 32bec04efc..5b461606e2 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/unmapped/C_isgylmfr net/minecraft/entity/passive/ArmadilloEn METHOD m_yzyomktj nextScuteSheddingCooldown ()I CLASS C_wqokwagt State FIELD f_anjxyhoc PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; - FIELD f_bqkewtss lengthTicks I + FIELD f_bqkewtss duration I FIELD f_fxutpqqj BY_ID Ljava/util/function/IntFunction; FIELD f_jrnhcgzn name Ljava/lang/String; FIELD f_sekwejqr CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; @@ -40,7 +40,7 @@ CLASS net/minecraft/unmapped/C_isgylmfr net/minecraft/entity/passive/ArmadilloEn METHOD m_iofbcnyp getId ()I METHOD m_kdhwawjl fromName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_isgylmfr$C_wqokwagt; ARG 0 name - METHOD m_lgowlnpl getLengthTicks ()I + METHOD m_lgowlnpl getDuration ()I METHOD m_vcmbmqck shouldRollUp (J)Z ARG 1 currentStateTicks METHOD m_zmxoergx isThreatened ()Z diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index d6fd1e8959..ecf7b155c9 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -81,24 +81,20 @@ CLASS net/minecraft/unmapped/C_dkiorddu net/minecraft/entity/passive/AxolotlEnti ARG 3 maxYawDifference CLASS C_wibhmvyi Variant FIELD f_bsgarvwt id I - FIELD f_hxixfkzl key Ljava/lang/String; + FIELD f_hxixfkzl name Ljava/lang/String; FIELD f_nonrkxpt CODEC Lcom/mojang/serialization/Codec; - FIELD f_ujjymvcq VARIANTS Ljava/util/function/IntFunction; + FIELD f_ujjymvcq BY_ID Ljava/util/function/IntFunction; FIELD f_ykasltgf natural Z - METHOD (Ljava/lang/String;IILjava/lang/String;Z)V - ARG 3 id - ARG 4 key - ARG 5 natural METHOD m_biatcobk getRandomNatural (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_dkiorddu$C_wibhmvyi; ARG 0 random - METHOD m_dgvlsyym get (I)Lnet/minecraft/unmapped/C_dkiorddu$C_wibhmvyi; + METHOD m_dgvlsyym byId (I)Lnet/minecraft/unmapped/C_dkiorddu$C_wibhmvyi; ARG 0 id METHOD m_khmanwnl (ZLnet/minecraft/unmapped/C_dkiorddu$C_wibhmvyi;)Z ARG 1 variant - METHOD m_mfptbgae id ()I + METHOD m_mfptbgae getId ()I METHOD m_rccogdrt getRandom (Lnet/minecraft/unmapped/C_rlomrsco;Z)Lnet/minecraft/unmapped/C_dkiorddu$C_wibhmvyi; ARG 0 random ARG 1 natural - METHOD m_tvtpucta key ()Ljava/lang/String; + METHOD m_tvtpucta getName ()Ljava/lang/String; METHOD m_wnfsspzw getRandomUnnatural (Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_dkiorddu$C_wibhmvyi; ARG 0 random diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 959d92486e..8c5cb7d071 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/unmapped/C_rxtmregr net/minecraft/entity/passive/CatEntity COMMENT Meow. + FIELD f_cmwfbyhe DEFAULT_VARIANT Lnet/minecraft/unmapped/C_xhhleach; FIELD f_crlwzfoc HEAD_DOWN Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_czqfqakz prevSleepAnimation F FIELD f_ebcwdxuh tailCurlAnimation F @@ -11,6 +12,7 @@ CLASS net/minecraft/unmapped/C_rxtmregr net/minecraft/entity/passive/CatEntity FIELD f_krqstxdp headDownAnimation F FIELD f_lfmjmddd COLLAR_COLOR Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_lsvomhnh SPRINTING_SPEED D + FIELD f_mhntxktq nearSleepingPlayer Z FIELD f_qmmhiplw prevHeadDownAnimation F FIELD f_rbvswzvj prevTailCurlAnimation F FIELD f_uqdbaiuw temptGoal Lnet/minecraft/unmapped/C_klcypqlq; @@ -22,6 +24,7 @@ CLASS net/minecraft/unmapped/C_rxtmregr net/minecraft/entity/passive/CatEntity METHOD m_hklpzhfy updateAnimations ()V METHOD m_hrmkvfwy createAttributes ()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus; METHOD m_jegafqgf tryTame (Lnet/minecraft/unmapped/C_jzrpycqo;)V + METHOD m_jmkrmfxa isNearSleepingPlayer ()Z METHOD m_lamyttdk isInSleepingPose ()Z COMMENT {@return whether this cat is in a sleeping pose} METHOD m_mkychxup setCollarColor (Lnet/minecraft/unmapped/C_arllgqae;)V diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index c98c9793fc..b10c2ccfa2 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -106,6 +106,18 @@ CLASS net/minecraft/unmapped/C_axinhusn net/minecraft/entity/passive/FoxEntity METHOD m_hzdxsxyl isAtFavoredLocation ()Z CLASS C_clucitvs FoxLookControl CLASS C_cwkbtmvo FoxMoveControl + CLASS C_dqmtshhc Variant + FIELD f_kptztpsi BY_ID Ljava/util/function/IntFunction; + FIELD f_kqzgmetw CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; + FIELD f_nassxknl name Ljava/lang/String; + FIELD f_vgcpbciz id I + METHOD m_ffwzpefo byName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_axinhusn$C_dqmtshhc; + ARG 0 name + METHOD m_pjzcozwh byId (I)Lnet/minecraft/unmapped/C_axinhusn$C_dqmtshhc; + ARG 0 id + METHOD m_qtzulqba getId ()I + METHOD m_vreukxrr byBiome (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_axinhusn$C_dqmtshhc; + ARG 0 biome CLASS C_eclzhatf StopWanderingGoal FIELD f_hydiykel timer I CLASS C_ffhqzlak LookAtEntityGoal diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index 813d85253a..770f2b6d3e 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_gcfircge net/minecraft/entity/passive/FrogEntity FIELD f_ituaqaqf SENSORS Lcom/google/common/collect/ImmutableList; FIELD f_kbrwwixv longJumpAnimationState Lnet/minecraft/unmapped/C_kxntavoz; FIELD f_mupmmsbd TARGET_ENTITY_ID Lnet/minecraft/unmapped/C_rinmcaxy; + FIELD f_qqtdnpku DEFAULT_VARIANT Lnet/minecraft/unmapped/C_xhhleach; FIELD f_tvuakrkf croakAnimationState Lnet/minecraft/unmapped/C_kxntavoz; FIELD f_ulbksrem TYPE Lnet/minecraft/unmapped/C_rinmcaxy; FIELD f_wjjrdvsc VARIANT_NBT_KEY Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/passive/FrogVariant.mapping b/mappings/net/minecraft/entity/passive/FrogVariant.mapping index 3a0c1e0211..76c239ebf0 100644 --- a/mappings/net/minecraft/entity/passive/FrogVariant.mapping +++ b/mappings/net/minecraft/entity/passive/FrogVariant.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/unmapped/C_idxitzip net/minecraft/entity/passive/FrogVariant - FIELD f_cqaiamli id Lnet/minecraft/unmapped/C_ncpywfca; + FIELD f_cqaiamli textureId Lnet/minecraft/unmapped/C_ncpywfca; METHOD (Lnet/minecraft/unmapped/C_ncpywfca;)V ARG 1 id METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_acomowiu bootstrap (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_idxitzip; - METHOD m_rojrtzwd getKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; - METHOD m_saozpydd id ()Lnet/minecraft/unmapped/C_ncpywfca; + METHOD m_rojrtzwd createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_saozpydd textureId ()Lnet/minecraft/unmapped/C_ncpywfca; METHOD m_wvvrbffk create (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;)Lnet/minecraft/unmapped/C_idxitzip; - ARG 2 type diff --git a/mappings/net/minecraft/entity/passive/HorseColor.mapping b/mappings/net/minecraft/entity/passive/HorseColor.mapping index 567bdc698b..a66c894d8a 100644 --- a/mappings/net/minecraft/entity/passive/HorseColor.mapping +++ b/mappings/net/minecraft/entity/passive/HorseColor.mapping @@ -1,10 +1,7 @@ CLASS net/minecraft/unmapped/C_pftaultf net/minecraft/entity/passive/HorseColor - FIELD f_pykxuxiu VALUES Ljava/util/function/IntFunction; + FIELD f_pykxuxiu BY_ID Ljava/util/function/IntFunction; FIELD f_tfxckurc name Ljava/lang/String; - FIELD f_vjtbepqk index I - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 index - ARG 4 name - METHOD m_rpbzzkyt byIndex (I)Lnet/minecraft/unmapped/C_pftaultf; - ARG 0 index - METHOD m_xgbaxjfm getIndex ()I + FIELD f_vjtbepqk id I + METHOD m_rpbzzkyt byId (I)Lnet/minecraft/unmapped/C_pftaultf; + ARG 0 id + METHOD m_xgbaxjfm getId ()I diff --git a/mappings/net/minecraft/entity/passive/HorseMarking.mapping b/mappings/net/minecraft/entity/passive/HorseMarking.mapping index a9d054efb5..1e11833319 100644 --- a/mappings/net/minecraft/entity/passive/HorseMarking.mapping +++ b/mappings/net/minecraft/entity/passive/HorseMarking.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/unmapped/C_izltrckh net/minecraft/entity/passive/HorseMarking - FIELD f_jmrenxpl VALUES Ljava/util/function/IntFunction; - FIELD f_uwbtuoho index I - METHOD (Ljava/lang/String;II)V - ARG 3 index - METHOD m_hjnowxip byIndex (I)Lnet/minecraft/unmapped/C_izltrckh; - ARG 0 index - METHOD m_jfctvvag getIndex ()I + FIELD f_jmrenxpl BY_ID Ljava/util/function/IntFunction; + FIELD f_uwbtuoho id I + METHOD m_hjnowxip byId (I)Lnet/minecraft/unmapped/C_izltrckh; + ARG 0 id + METHOD m_jfctvvag getId ()I diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index 5c97f6fd7a..a95e869d2d 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -24,16 +24,13 @@ CLASS net/minecraft/unmapped/C_jzrmkmyj net/minecraft/entity/passive/LlamaEntity ARG 1 llama METHOD m_ziuntool hasFollower ()Z CLASS C_bamxtdwv Variant - FIELD f_awosmvfj key Ljava/lang/String; + FIELD f_awosmvfj name Ljava/lang/String; FIELD f_eydlbpra CODEC Lcom/mojang/serialization/Codec; FIELD f_hjcijjth id I - FIELD f_qfglbuhf VARIANTS Ljava/util/function/IntFunction; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 key - METHOD m_rxkqawos get (I)Lnet/minecraft/unmapped/C_jzrmkmyj$C_bamxtdwv; + FIELD f_qfglbuhf BY_ID Ljava/util/function/IntFunction; + METHOD m_rxkqawos byId (I)Lnet/minecraft/unmapped/C_jzrmkmyj$C_bamxtdwv; ARG 0 id - METHOD m_tgezfyjh id ()I + METHOD m_tgezfyjh getId ()I CLASS C_bmfhutoq ChaseWolvesGoal METHOD (Lnet/minecraft/unmapped/C_jzrmkmyj;)V ARG 1 llama diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 516acb259e..ef4e595f6b 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -94,11 +94,7 @@ CLASS net/minecraft/unmapped/C_ogdzfiek net/minecraft/entity/passive/PandaEntity FIELD f_lhtfrejp GENE_CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; FIELD f_mirrwljl id I FIELD f_mumtwisj name Ljava/lang/String; - FIELD f_tzyyzptr VALUES Ljava/util/function/IntFunction; - METHOD (Ljava/lang/String;IILjava/lang/String;Z)V - ARG 3 id - ARG 4 name - ARG 5 recessive + FIELD f_tzyyzptr BY_ID Ljava/util/function/IntFunction; METHOD m_dywrtdnt isRecessive ()Z METHOD m_hijobhtj byId (I)Lnet/minecraft/unmapped/C_ogdzfiek$C_djzoyosk; ARG 0 id diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index 9b21f9155b..c6758af9a7 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -31,15 +31,12 @@ CLASS net/minecraft/unmapped/C_ombdzkxc net/minecraft/entity/passive/ParrotEntit METHOD test (Ljava/lang/Object;)Z ARG 1 entity CLASS C_vrrzomrk Variant - FIELD f_ionelagg VARIANTS Ljava/util/function/IntFunction; - FIELD f_lyjclikp key Ljava/lang/String; + FIELD f_ionelagg BY_ID Ljava/util/function/IntFunction; + FIELD f_lyjclikp name Ljava/lang/String; FIELD f_plgymzwe id I FIELD f_vgfcuyii CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 key - METHOD m_jquwagcv get (I)Lnet/minecraft/unmapped/C_ombdzkxc$C_vrrzomrk; + METHOD m_jquwagcv byId (I)Lnet/minecraft/unmapped/C_ombdzkxc$C_vrrzomrk; ARG 0 id - METHOD m_mhaphmct id ()I + METHOD m_mhaphmct getId ()I CLASS C_zeiqwbga ParrotWanderGoal METHOD m_ablbecac getTreePos ()Lnet/minecraft/unmapped/C_vgpupfxx; diff --git a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping index 20a31610dd..edb16c50a8 100644 --- a/mappings/net/minecraft/entity/passive/SnifferEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SnifferEntity.mapping @@ -56,6 +56,4 @@ CLASS net/minecraft/unmapped/C_frelvdpe net/minecraft/entity/passive/SnifferEnti FIELD f_tbzquwfe RISING Lnet/minecraft/unmapped/C_frelvdpe$C_ekatpfyn; FIELD f_toduazac DIGGING Lnet/minecraft/unmapped/C_frelvdpe$C_ekatpfyn; FIELD f_uanohqne SCENTING Lnet/minecraft/unmapped/C_frelvdpe$C_ekatpfyn; - METHOD (Ljava/lang/String;II)V - ARG 3 id METHOD m_jwgewysc getId ()I diff --git a/mappings/net/minecraft/entity/passive/WolfVariants.mapping b/mappings/net/minecraft/entity/passive/WolfVariants.mapping index 7071e730ac..5c325106aa 100644 --- a/mappings/net/minecraft/entity/passive/WolfVariants.mapping +++ b/mappings/net/minecraft/entity/passive/WolfVariants.mapping @@ -4,10 +4,12 @@ CLASS net/minecraft/unmapped/C_udrqifai net/minecraft/entity/passive/WolfVariant ARG 1 biome METHOD m_lnueigda createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; METHOD m_ouhhqrrg register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;Lnet/minecraft/unmapped/C_ednuhnnn;)V + ARG 3 biomes METHOD m_pzmgmdro register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;)V - ARG 1 variantKey - ARG 3 biomeKey + ARG 3 biome METHOD m_uoffyfmm register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;Lnet/minecraft/unmapped/C_odfnijdo;)V ARG 2 name ARG 3 biomes + METHOD m_wcvtxavz (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z + ARG 1 holder METHOD m_zhaexgds bootstrap (Lnet/minecraft/unmapped/C_hqoyyfco;)V diff --git a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping index 48ebb2fa70..5a41ead12e 100644 --- a/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/AbstractMinecartEntity.mapping @@ -43,6 +43,7 @@ CLASS net/minecraft/unmapped/C_tahhkgty net/minecraft/entity/vehicle/AbstractMin ARG 1 pos METHOD m_yrpbpsae moveOffRail (Lnet/minecraft/unmapped/C_bdwnwhiu;)V METHOD m_yvrwkcqb applySlowdown (Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_vgpupfxx; + ARG 1 velocity METHOD m_zqqbmhzn hasCustomBlock ()Z METHOD m_zrztaorn (Ljava/util/EnumMap;)V ARG 0 map diff --git a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping index 8a3b682f7b..628fb54efa 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping @@ -1,7 +1,10 @@ CLASS net/minecraft/unmapped/C_yyrquvgz net/minecraft/entity/vehicle/StorageMinecartEntity FIELD f_giroimfl inventory Lnet/minecraft/unmapped/C_rnrfftze; - FIELD f_mlivraya lootTableId Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_mlivraya lootTable Lnet/minecraft/unmapped/C_xhhleach; FIELD f_ylaiueuc lootSeed J + METHOD m_faucbiwk setLootProperties (Lnet/minecraft/unmapped/C_xhhleach;J)V + ARG 1 lootTable + ARG 2 seed METHOD m_vljvfgol getScreenHandler (ILnet/minecraft/unmapped/C_sxzqocrm;)Lnet/minecraft/unmapped/C_mkrkudpa; ARG 1 syncId ARG 2 playerInventory diff --git a/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping b/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping index 5076097ad2..c69cf7f0d7 100644 --- a/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping +++ b/mappings/net/minecraft/entity/vehicle/StorageVehicle.mapping @@ -8,19 +8,25 @@ CLASS net/minecraft/unmapped/C_srvkmyvp net/minecraft/entity/vehicle/StorageVehi METHOD m_iemddgjw writeStorage (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V ARG 1 nbt ARG 2 lookupProvider + METHOD m_ixbkjejb getLootSeed ()J METHOD m_keckkfsk getStorageStack (I)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 1 slot METHOD m_kqxvnqqn getWorld ()Lnet/minecraft/unmapped/C_cdctfzbn; METHOD m_kutapocv getStorageStackReference (I)Lnet/minecraft/unmapped/C_xkkpnyvk; ARG 1 mappedIndex METHOD m_lgqlkcep getBounds ()Lnet/minecraft/unmapped/C_hbcjzgoe; + METHOD m_mvclgeqi setLootTable (Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 lootTable METHOD m_otoutzlq removeStorageStack (I)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 1 slot METHOD m_oughjdjm getStacks ()Lnet/minecraft/unmapped/C_rnrfftze; + METHOD m_ozrwrjzp getLootTable ()Lnet/minecraft/unmapped/C_xhhleach; METHOD m_paxurfti readStorage (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V ARG 1 nbt ARG 2 lookupProvider METHOD m_pihrdwyv resetStorage ()V + METHOD m_plgxqonm setLootSeed (J)V + ARG 1 seed METHOD m_pmcucocf drop (Lnet/minecraft/unmapped/C_sbxfkpyv;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)V ARG 1 source ARG 3 entity diff --git a/mappings/net/minecraft/inventory/LootableInventory.mapping b/mappings/net/minecraft/inventory/LootableInventory.mapping index 090b6410c6..ffd11a6d94 100644 --- a/mappings/net/minecraft/inventory/LootableInventory.mapping +++ b/mappings/net/minecraft/inventory/LootableInventory.mapping @@ -2,7 +2,8 @@ CLASS net/minecraft/unmapped/C_ehawoasn net/minecraft/inventory/LootableInventor FIELD f_yeibkfzd LOOT_TABLE_SEED_KEY Ljava/lang/String; FIELD f_ztchflsp LOOT_TABLE_KEY Ljava/lang/String; METHOD m_dmdivonx setLootTable (Lnet/minecraft/unmapped/C_xhhleach;)V - METHOD m_drfdhyfv getLootTableId ()Lnet/minecraft/unmapped/C_xhhleach; + ARG 1 lootTable + METHOD m_drfdhyfv getLootTable ()Lnet/minecraft/unmapped/C_xhhleach; METHOD m_mtzsyvbu setupLoot (Lnet/minecraft/unmapped/C_jzrpycqo;)V ARG 1 player METHOD m_njtcujiz readLootTableNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z @@ -14,5 +15,6 @@ CLASS net/minecraft/unmapped/C_ehawoasn net/minecraft/inventory/LootableInventor METHOD m_uxrpqxab getLootTableSeed ()J METHOD m_vhsehsrn setupLootTable (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;)V METHOD m_xukvibrq setLootTable (Lnet/minecraft/unmapped/C_xhhleach;J)V + ARG 1 lootTable METHOD m_ycwokqel writeLootTableNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Z ARG 1 nbt diff --git a/mappings/net/minecraft/item/BannerPatterns.mapping b/mappings/net/minecraft/item/BannerPatterns.mapping index 94539481cf..2fe1cd6523 100644 --- a/mappings/net/minecraft/item/BannerPatterns.mapping +++ b/mappings/net/minecraft/item/BannerPatterns.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/unmapped/C_lmlxpsml net/minecraft/item/BannerPatterns METHOD m_gogzazvm createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; - ARG 0 path METHOD m_iuxajiyk register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;)V - ARG 0 pattern + ARG 1 pattern METHOD m_shrfwjxe bootstrap (Lnet/minecraft/unmapped/C_hqoyyfco;)V - ARG 0 pattern diff --git a/mappings/net/minecraft/item/ConsumableComponent.mapping b/mappings/net/minecraft/item/ConsumableComponent.mapping new file mode 100644 index 0000000000..dc2f3cdc7d --- /dev/null +++ b/mappings/net/minecraft/item/ConsumableComponent.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/unmapped/C_ybwnbwdi net/minecraft/item/ConsumableComponent diff --git a/mappings/net/minecraft/item/ConsumeEffect.mapping b/mappings/net/minecraft/item/ConsumeEffect.mapping new file mode 100644 index 0000000000..d69a9f66f3 --- /dev/null +++ b/mappings/net/minecraft/item/ConsumeEffect.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_uocfnrao net/minecraft/item/ConsumeEffect + CLASS C_lplzxssc Type + FIELD f_bfphspah packetCodec Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD m_amcqqhjh packetCodec ()Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD m_dmyekdjf register (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_uocfnrao$C_lplzxssc; diff --git a/mappings/net/minecraft/item/Instruments.mapping b/mappings/net/minecraft/item/Instruments.mapping index af9c90bbd9..19ef2a672f 100644 --- a/mappings/net/minecraft/item/Instruments.mapping +++ b/mappings/net/minecraft/item/Instruments.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/unmapped/C_cffsqeei net/minecraft/item/Instruments FIELD f_czvlxzoq DEFAULT_DURATION F FIELD f_rsuhkejp DEFAULT_RANGE I - METHOD m_uoauhstj create (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; - ARG 0 id + METHOD m_qiyrmnpc register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_cjzoxshv;FF)V + ARG 1 instrument + METHOD m_uoauhstj createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; METHOD m_vmyhpcqf initialize (Lnet/minecraft/unmapped/C_hqoyyfco;)V diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 5781af1b4e..339fc36ea7 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -182,7 +182,14 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item CLASS C_bfrytpdl Settings FIELD f_emilnckp recipeRemainder Lnet/minecraft/unmapped/C_vorddnax; FIELD f_gjqaneav requiredFlags Lnet/minecraft/unmapped/C_czxxrbcp; + FIELD f_guuibeel key Lnet/minecraft/unmapped/C_xhhleach; FIELD f_znexcclr builder Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz; + METHOD m_dmwpwxbl food (Lnet/minecraft/unmapped/C_cgikuact;Lnet/minecraft/unmapped/C_ybwnbwdi;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; + ARG 1 food + ARG 2 consumable + METHOD m_fazzsuba food (Lnet/minecraft/unmapped/C_cgikuact;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; + METHOD m_fcpbtbaw (Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; + ARG 1 repairMaterial METHOD m_gdfazvhf maxCount (I)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; COMMENT Sets the maximum stack count of any ItemStack with an Item using this Settings instance. COMMENT @@ -220,7 +227,11 @@ CLASS net/minecraft/unmapped/C_vorddnax net/minecraft/item/Item METHOD m_voqbvsse component (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; ARG 1 type ARG 2 value + METHOD m_whyakhiv repairable (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; + ARG 1 repairMaterials METHOD m_wosoxphz attributeModifiersComponent (Lnet/minecraft/unmapped/C_azfkqhlm;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; + METHOD m_xgbhdxzx key (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; + ARG 1 key METHOD m_zglwepxe rarity (Lnet/minecraft/unmapped/C_mqmixksm;)Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl; COMMENT Sets the {@link Rarity} of any item configured with this Settings instance, which changes the color of its name. COMMENT diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index b81e2ecdaa..d23acff4e3 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -1,6 +1,22 @@ CLASS net/minecraft/unmapped/C_zxoagntf net/minecraft/item/Items METHOD m_cndbkmly register (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_vorddnax; + METHOD m_dlkvvdke register (Ljava/lang/String;Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)Lnet/minecraft/unmapped/C_vorddnax; + METHOD m_grzvwwon register (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_vorddnax; + METHOD m_gvdjnkxx register (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/function/BiFunction;)Lnet/minecraft/unmapped/C_vorddnax; + ARG 1 factory + METHOD m_imjbimti register (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)Lnet/minecraft/unmapped/C_vorddnax; + METHOD m_lawenngf createBlockItemFactory (Lnet/minecraft/unmapped/C_mmxmpdoq;)Ljava/util/function/Function; + METHOD m_nlzjkhxb createKey (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 block + METHOD m_rvvageet register (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/function/BiFunction;Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)Lnet/minecraft/unmapped/C_vorddnax; + ARG 1 factory + METHOD m_swynbxjs register (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)Lnet/minecraft/unmapped/C_vorddnax; METHOD m_vhtdhemv register (Lnet/minecraft/unmapped/C_mmxmpdoq;Ljava/util/function/UnaryOperator;)Lnet/minecraft/unmapped/C_vorddnax; ARG 1 settingsTransformer + METHOD m_voovvgbm createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; METHOD m_xlquwwvg register (Lnet/minecraft/unmapped/C_mmxmpdoq;[Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_vorddnax; ARG 1 blocks + METHOD m_ynljympb register (Ljava/lang/String;)Lnet/minecraft/unmapped/C_vorddnax; + METHOD m_ynttcfma register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_vorddnax; + METHOD m_zduspdhp register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)Lnet/minecraft/unmapped/C_vorddnax; + ARG 1 factory diff --git a/mappings/net/minecraft/item/JukeboxSongs.mapping b/mappings/net/minecraft/item/JukeboxSongs.mapping index 58ebfe6133..dc61aa73ec 100644 --- a/mappings/net/minecraft/item/JukeboxSongs.mapping +++ b/mappings/net/minecraft/item/JukeboxSongs.mapping @@ -4,4 +4,5 @@ CLASS net/minecraft/unmapped/C_upcjrbni net/minecraft/item/JukeboxSongs FIELD f_tjmclwet THIRTEEN Lnet/minecraft/unmapped/C_xhhleach; METHOD m_gorfrttr createKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; METHOD m_jkffhrip register (Lnet/minecraft/unmapped/C_hqoyyfco;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;II)V + ARG 1 song METHOD m_yfbawkoa bootstrap (Lnet/minecraft/unmapped/C_hqoyyfco;)V diff --git a/mappings/net/minecraft/item/UseAnimation.mapping b/mappings/net/minecraft/item/UseAnimation.mapping new file mode 100644 index 0000000000..a3212bb50a --- /dev/null +++ b/mappings/net/minecraft/item/UseAnimation.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/unmapped/C_qeajvgxm net/minecraft/item/UseAnimation + FIELD f_gcmqdixi id I + FIELD f_pxhheyut BY_ID Ljava/util/function/IntFunction; + FIELD f_vmwuyela name Ljava/lang/String; + METHOD m_jtlfencz getId ()I diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping index 47dbf0cbb8..ebbe666397 100644 --- a/mappings/net/minecraft/loot/LootDataType.mapping +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -1,9 +1,20 @@ CLASS net/minecraft/unmapped/C_gvzqwcwq net/minecraft/loot/LootDataType - FIELD f_zybjkfjt validator Lnet/minecraft/unmapped/C_gvzqwcwq$C_ntpbpvku; + FIELD f_htjtlkmg registry Lnet/minecraft/unmapped/C_xhhleach; METHOD m_bgciklpf createLootTableValidator ()Lnet/minecraft/unmapped/C_gvzqwcwq$C_ntpbpvku; METHOD m_eenuqtkp stream ()Ljava/util/stream/Stream; + METHOD m_gcfrtkuq registry ()Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_mffbiakv (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_inwsuliy;)V + ARG 0 reporter + ARG 1 key + ARG 2 contextAware METHOD m_xqndkipm createSimpleValidator ()Lnet/minecraft/unmapped/C_gvzqwcwq$C_ntpbpvku; METHOD m_xyebpstg validate (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;)V - ARG 1 reporter - ARG 3 element + METHOD m_yyxqxjkd (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_dogcxkxz;)V + ARG 0 reporter + ARG 1 key + ARG 2 contextAware CLASS C_ntpbpvku Validator + METHOD run (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;)V + ARG 1 reporter + ARG 2 key + ARG 3 element diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index 8d0ad28097..92351b5bfa 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/unmapped/C_eumtgsbp net/minecraft/loot/LootTableReporter FIELD f_psnzcplo visitedElements Ljava/util/Set; FIELD f_spdbzdri dataLookup Ljava/util/Optional; FIELD f_tqavjmzz contextType Lnet/minecraft/unmapped/C_vczsvjil; + METHOD (Lnet/minecraft/unmapped/C_jtpvewkp;Lnet/minecraft/unmapped/C_vczsvjil;Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst;)V + ARG 3 dataLookup + METHOD m_cftbvarw getErrorReporter ()Lnet/minecraft/unmapped/C_jtpvewkp; METHOD m_glhnmzie makeChild (Ljava/lang/String;)Lnet/minecraft/unmapped/C_eumtgsbp; ARG 1 name METHOD m_gqledvzt validateContext (Lnet/minecraft/unmapped/C_dogcxkxz;)V @@ -10,8 +13,10 @@ CLASS net/minecraft/unmapped/C_eumtgsbp net/minecraft/loot/LootTableReporter METHOD m_jwjmhnkf makeChild (Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_eumtgsbp; ARG 1 name METHOD m_qfxfbvfj hasVisited (Lnet/minecraft/unmapped/C_xhhleach;)Z + ARG 1 element METHOD m_qktyesto withContextType (Lnet/minecraft/unmapped/C_vczsvjil;)Lnet/minecraft/unmapped/C_eumtgsbp; ARG 1 contextType METHOD m_rxfxlyoi getDataLookup ()Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst; METHOD m_tbxtkgvh report (Ljava/lang/String;)V ARG 1 message + METHOD m_tsoypkps hasDataLookup ()Z diff --git a/mappings/net/minecraft/loot/LootTables.mapping b/mappings/net/minecraft/loot/LootTables.mapping index 324227703f..e40244b415 100644 --- a/mappings/net/minecraft/loot/LootTables.mapping +++ b/mappings/net/minecraft/loot/LootTables.mapping @@ -3,8 +3,10 @@ CLASS net/minecraft/unmapped/C_xnoqcfpj net/minecraft/loot/LootTables FIELD f_bhevpouw VILLAGE_TEMPLE_CHEST Lnet/minecraft/unmapped/C_xhhleach; FIELD f_joewkzrj VILLAGE_BUTCHER_CHEST Lnet/minecraft/unmapped/C_xhhleach; FIELD f_lkdqawko VILLAGE_FLETCHER_CHEST Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_lmifmzrj SHEEP_ENTITIES_BY_COLOR Ljava/util/Map; FIELD f_mgjxzucd LOOT_TABLES_READ_ONLY Ljava/util/Set; FIELD f_mryanozm VILLAGE_TOOLSMITH_CHEST Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_nceydkdw SHEEP_SHEERING_BY_COLOR Ljava/util/Map; FIELD f_nupqwuju VILLAGE_DESERT_HOUSE_CHEST Lnet/minecraft/unmapped/C_xhhleach; FIELD f_oimsfxgn VILLAGE_TANNERY_CHEST Lnet/minecraft/unmapped/C_xhhleach; FIELD f_onoawbtl VILLAGE_PLAINS_CHEST Lnet/minecraft/unmapped/C_xhhleach; @@ -18,6 +20,14 @@ CLASS net/minecraft/unmapped/C_xnoqcfpj net/minecraft/loot/LootTables FIELD f_ycaqywao VILLAGE_MASON_CHEST Lnet/minecraft/unmapped/C_xhhleach; FIELD f_ylsmysdw SPAWN_BONUS_CHEST Lnet/minecraft/unmapped/C_xhhleach; FIELD f_yuieffew VILLAGE_SNOWY_HOUSE_CHEST Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_hjhwhuem (Ljava/util/EnumMap;)V + ARG 0 colorMap METHOD m_jwrysiar register (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_rguwrojz registerByColors (Ljava/util/EnumMap;Ljava/lang/String;)V + ARG 0 lootTablesByColor + ARG 1 path + METHOD m_vqefbihp (Ljava/util/EnumMap;)V + ARG 0 colorMap METHOD m_xfbxwuct register (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 lootTable METHOD m_ytdzbpyb getAll ()Ljava/util/Set; diff --git a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping index ecfeab5664..0f5ec62432 100644 --- a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/unmapped/C_dtftepex net/minecraft/loot/condition/ReferenceLootCondition - FIELD f_uqweqzmx id Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_uqweqzmx condition Lnet/minecraft/unmapped/C_xhhleach; FIELD f_yjsawjni LOGGER Lorg/slf4j/Logger; METHOD m_ciazakem builder (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn; + ARG 0 condition + METHOD m_jqawbmhv condition ()Lnet/minecraft/unmapped/C_xhhleach; METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/loot/entry/LeafEntry.mapping index b028c07b5f..28abceabde 100644 --- a/mappings/net/minecraft/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LeafEntry.mapping @@ -1,18 +1,19 @@ CLASS net/minecraft/unmapped/C_sphmzmsf net/minecraft/loot/entry/LeafEntry - FIELD f_aytiidkr quality I 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 Ljava/util/List; - FIELD f_wauvnusi weight I FIELD f_zccepqpd compiledFunctions Ljava/util/function/BiFunction; - METHOD (IILjava/util/List;Ljava/util/List;)V - ARG 3 conditions METHOD m_dlwclfgf builder (Lnet/minecraft/unmapped/C_sphmzmsf$C_wkmtcodm;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; ARG 0 factory + METHOD m_gefjoluq (Lnet/minecraft/unmapped/C_sphmzmsf;)Ljava/lang/Integer; + ARG 0 entry METHOD m_jptxqkrt generateLoot (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_iakykpgh;)V ARG 1 lootConsumer ARG 2 context + METHOD m_tzhapdtn (Lnet/minecraft/unmapped/C_sphmzmsf;)Ljava/util/List; + ARG 0 entry + METHOD m_uvcklnbk (Lnet/minecraft/unmapped/C_sphmzmsf;)Ljava/lang/Integer; + ARG 0 entry CLASS C_agvvrbll Choice CLASS C_lbxiirfw Builder FIELD f_pfukqpjm weight I @@ -28,3 +29,8 @@ CLASS net/minecraft/unmapped/C_sphmzmsf net/minecraft/loot/entry/LeafEntry METHOD (Lnet/minecraft/unmapped/C_sphmzmsf$C_wkmtcodm;)V ARG 1 factory CLASS C_wkmtcodm Factory + METHOD build (IILjava/util/List;Ljava/util/List;)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 b29f213ae2..892a11c2db 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/unmapped/C_rhqekity net/minecraft/loot/entry/LootPoolEntry FIELD f_fgvzyvok conditionPredicate Ljava/util/function/Predicate; - 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 diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 7cc15718b8..41f697f7a5 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1 +1,27 @@ CLASS net/minecraft/unmapped/C_dtvnrhoh net/minecraft/loot/entry/LootTableEntry + METHOD m_hgxsjkfj (Lnet/minecraft/unmapped/C_iakykpgh;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_inwsuliy; + ARG 1 key + METHOD m_jbzcbngc (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 2 holder + METHOD m_jhwltfko (Lnet/minecraft/unmapped/C_dtvnrhoh;)Lcom/mojang/datafixers/util/Either; + ARG 0 entry + METHOD m_ogwgyzpl builder (Lnet/minecraft/unmapped/C_inwsuliy;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; + ARG 0 lootTable + METHOD m_pztzsado (Lnet/minecraft/unmapped/C_inwsuliy;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/unmapped/C_sphmzmsf; + ARG 1 weight + ARG 2 quality + ARG 3 conditions + ARG 4 functions + METHOD m_tlrbqmtd (Lnet/minecraft/unmapped/C_inwsuliy;)Lnet/minecraft/unmapped/C_inwsuliy; + ARG 0 lootTable + METHOD m_ucredfoy (Lnet/minecraft/unmapped/C_xhhleach;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/unmapped/C_sphmzmsf; + ARG 1 weight + ARG 2 quality + ARG 3 conditions + ARG 4 functions + METHOD m_wboqiqkf builder (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_sphmzmsf$C_lbxiirfw; + ARG 0 key + METHOD m_wkhkuvxo (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_inwsuliy;)V + ARG 1 lootTable + METHOD m_yluromqt (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 key diff --git a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping index b2a05acc74..a45e790b95 100644 --- a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/unmapped/C_krisseon net/minecraft/loot/function/ConditionalLootFunction FIELD f_eefssiwv predicate Ljava/util/function/Predicate; - FIELD f_ksptazzw conditions Ljava/util/List; METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 itemStack ARG 2 context METHOD m_axzztavb process (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_iakykpgh;)Lnet/minecraft/unmapped/C_sddaxwyk; ARG 1 stack ARG 2 context + METHOD m_vkwiaxpm (Lnet/minecraft/unmapped/C_krisseon;)Ljava/util/List; + ARG 0 function METHOD m_wklwxxae builder (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; ARG 0 joiner CLASS C_nhpzaayj Builder diff --git a/mappings/net/minecraft/loot/function/LootFunctionTable.mapping b/mappings/net/minecraft/loot/function/LootFunctionTable.mapping index 35a3541c11..7c5a07e376 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTable.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTable.mapping @@ -1,2 +1,10 @@ CLASS net/minecraft/unmapped/C_xaygoojx net/minecraft/loot/function/LootFunctionTable - FIELD f_toqcjiql identifier Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_toqcjiql lootFunction Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_fmdlsoui (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 2 holder + METHOD m_kdxpkeux (Lnet/minecraft/unmapped/C_xaygoojx;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 table + METHOD m_scyoclta builder (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; + ARG 0 lootFunction + METHOD m_xzmmbfbo (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/List;)Lnet/minecraft/unmapped/C_tmxhskql; + ARG 1 conditions diff --git a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index b4277a99c4..dc15203036 100644 --- a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -1,4 +1,19 @@ CLASS net/minecraft/unmapped/C_uaqvnphc net/minecraft/loot/function/SetLootTableLootFunction - FIELD f_asvawnnq seed J - FIELD f_krvywmzb type Lnet/minecraft/unmapped/C_cjzoxshv; - FIELD f_sqgmeqhc id Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_sqgmeqhc lootTable Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_afjocztx (Lnet/minecraft/unmapped/C_uaqvnphc;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 function + METHOD m_dzqrmuwu (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_wgqvodus;Ljava/util/List;)Lnet/minecraft/unmapped/C_tmxhskql; + ARG 2 conditions + METHOD m_gsrahwlg builder (Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; + ARG 0 blockEntity + ARG 1 lootTable + METHOD m_jkgbkadv builder (Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_xhhleach;J)Lnet/minecraft/unmapped/C_krisseon$C_nhpzaayj; + ARG 0 blockEntity + ARG 1 lootTable + ARG 2 seed + METHOD m_pechtmeo (Lnet/minecraft/unmapped/C_uaqvnphc;)Lnet/minecraft/unmapped/C_cjzoxshv; + ARG 0 function + METHOD m_wdagurqu (Lnet/minecraft/unmapped/C_uaqvnphc;)Ljava/lang/Long; + ARG 0 function + METHOD m_zgtokhpa (Lnet/minecraft/unmapped/C_xhhleach;JLnet/minecraft/unmapped/C_wgqvodus;Ljava/util/List;)Lnet/minecraft/unmapped/C_tmxhskql; + ARG 4 conditions diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 905ffdf9e1..7f880b1e4f 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/unmapped/C_anfarvhg net/minecraft/network/codec/PacketCodecs METHOD m_hzgsqquo fromCodec (Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_jqcxtmyk entryOf (Lnet/minecraft/unmapped/C_feaetnaz;)Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_likrvuxr holderSet (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu; + ARG 0 registry METHOD m_limimtjq fromCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_lyaauawx readCollectionSize (Lio/netty/buffer/ByteBuf;I)I ARG 1 maxSize @@ -69,8 +70,10 @@ CLASS net/minecraft/unmapped/C_anfarvhg net/minecraft/network/codec/PacketCodecs METHOD m_qaqftswj fromRegistryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_ttkrtamq fromRegistryCodecUnlimited (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu; METHOD m_ugyvwjlm registry (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu; + ARG 0 registry ARG 1 registryTransformer METHOD m_vpmnqxks holder (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu; + ARG 0 registry METHOD m_ydaogaft byteArray (I)Lnet/minecraft/unmapped/C_qsrmwluu; ARG 0 maxLength METHOD m_ygyhvfaa writeCollectionSize (Lio/netty/buffer/ByteBuf;II)V @@ -80,6 +83,9 @@ CLASS net/minecraft/unmapped/C_anfarvhg net/minecraft/network/codec/PacketCodecs ARG 0 element METHOD m_yypssatp toCollection (Ljava/util/function/IntFunction;)Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk; ARG 0 factory + CLASS C_kafuxsar + METHOD m_sqbtyjcv (Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_feaetnaz; + ARG 1 buf CLASS C_qovzsqii METHOD m_agijdhuy decode (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf diff --git a/mappings/net/minecraft/network/message/MessageStyle.mapping b/mappings/net/minecraft/network/message/MessageStyle.mapping index cfa4101002..7414fd5c1c 100644 --- a/mappings/net/minecraft/network/message/MessageStyle.mapping +++ b/mappings/net/minecraft/network/message/MessageStyle.mapping @@ -25,12 +25,16 @@ CLASS net/minecraft/unmapped/C_vnfbczzp net/minecraft/network/message/MessageSty ARG 1 text ARG 2 parameters CLASS C_tcjcksgx Parameter + FIELD f_jaewdbkf id I FIELD f_ovhpbapm text Lnet/minecraft/unmapped/C_vnfbczzp$C_tcjcksgx$C_koukivxq; FIELD f_rfputqgt CODEC Lcom/mojang/serialization/Codec; FIELD f_skgevxyc name Ljava/lang/String; FIELD f_slcberqz CONTENT Lnet/minecraft/unmapped/C_vnfbczzp$C_tcjcksgx; FIELD f_vfvwypla SENDER Lnet/minecraft/unmapped/C_vnfbczzp$C_tcjcksgx; + FIELD f_wddfkckq BY_ID Ljava/util/function/IntFunction; FIELD f_zzvzguen TARGET Lnet/minecraft/unmapped/C_vnfbczzp$C_tcjcksgx; + METHOD m_jqycbxit (Lnet/minecraft/unmapped/C_vnfbczzp$C_tcjcksgx;)I + ARG 0 param METHOD m_jyepfdgv (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_hasnsypd$C_iocvgdxe;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 text ARG 1 parameters @@ -43,6 +47,8 @@ CLASS net/minecraft/unmapped/C_vnfbczzp net/minecraft/network/message/MessageSty METHOD m_rmvcaicg (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_hasnsypd$C_iocvgdxe;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 text ARG 1 parameters + METHOD m_shroqvsb (Lnet/minecraft/unmapped/C_vnfbczzp$C_tcjcksgx;)I + ARG 0 param CLASS C_koukivxq SelectableText METHOD select (Lnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_hasnsypd$C_iocvgdxe;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 1 text diff --git a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping index 38bde50391..902cdf3c19 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/CommandTreeUpdateS2CPacket.mapping @@ -71,6 +71,8 @@ CLASS net/minecraft/unmapped/C_vzeoulff net/minecraft/network/packet/s2c/play/Co FIELD f_mndqyfwo argumentType Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye; METHOD (Lcom/mojang/brigadier/tree/ArgumentCommandNode;)V ARG 1 commandNode + METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;Lnet/minecraft/unmapped/C_ncpywfca;)V + ARG 3 suggestionId METHOD m_bncjsviq getSuggestionId (Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 0 provider METHOD m_mkgsnfyv write (Lnet/minecraft/unmapped/C_idfydwco;Lnet/minecraft/unmapped/C_yvmgapuw$C_jhdtbgye;)V diff --git a/mappings/net/minecraft/predicate/DataComponentPredicate.mapping b/mappings/net/minecraft/predicate/DataComponentPredicate.mapping index b789ce6460..38903f6fd2 100644 --- a/mappings/net/minecraft/predicate/DataComponentPredicate.mapping +++ b/mappings/net/minecraft/predicate/DataComponentPredicate.mapping @@ -11,4 +11,9 @@ CLASS net/minecraft/unmapped/C_naseleda net/minecraft/predicate/DataComponentPre ARG 1 componentMap CLASS C_qvundqhp Builder FIELD f_zqshleqs components Ljava/util/List; + METHOD m_jwpgiwvo add (Lnet/minecraft/unmapped/C_qkjwbfhx;)Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp; + ARG 1 component + METHOD m_paqnuexm add (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp; + ARG 1 type + ARG 2 value METHOD m_uvpclufp build ()Lnet/minecraft/unmapped/C_naseleda; diff --git a/mappings/net/minecraft/predicate/TagPredicate.mapping b/mappings/net/minecraft/predicate/TagPredicate.mapping index 34a8d6ce72..7dcb3e2a64 100644 --- a/mappings/net/minecraft/predicate/TagPredicate.mapping +++ b/mappings/net/minecraft/predicate/TagPredicate.mapping @@ -1,13 +1,10 @@ CLASS net/minecraft/unmapped/C_jocdhano net/minecraft/predicate/TagPredicate - FIELD f_gvrdxsyc expected Z - FIELD f_pppxkehw tagKey Lnet/minecraft/unmapped/C_ednuhnnn; METHOD (Lnet/minecraft/unmapped/C_ednuhnnn;Z)V ARG 1 tagKey ARG 2 expected METHOD m_ivqgtbrm test (Lnet/minecraft/unmapped/C_cjzoxshv;)Z ARG 1 holder METHOD m_qzjfdokv unexpected (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_jocdhano; - ARG 0 tagKey METHOD m_viztzsoe createCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/Codec; + ARG 0 registry 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/EntitySubPredicateTypes.mapping b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping index 5253d87926..546fa1cd55 100644 --- a/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping +++ b/mappings/net/minecraft/predicate/entity/EntitySubPredicateTypes.mapping @@ -7,6 +7,10 @@ CLASS net/minecraft/unmapped/C_qgtgvbyj net/minecraft/predicate/entity/EntitySub METHOD m_yelzxjjx (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ljtxhtrw; ARG 0 catVariantHolder CLASS C_oszyjpav DynamicVariantType + METHOD (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;)V + ARG 1 registry + METHOD m_dqjrqslm (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qgtgvbyj$C_oszyjpav; + ARG 0 registry METHOD m_oeubjkrf (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_ljtxhtrw; ARG 1 holderSet CLASS C_tchkalpp diff --git a/mappings/net/minecraft/recipe/CraftingCategory.mapping b/mappings/net/minecraft/recipe/CraftingCategory.mapping index c5c2edc1c0..8a14f416c4 100644 --- a/mappings/net/minecraft/recipe/CraftingCategory.mapping +++ b/mappings/net/minecraft/recipe/CraftingCategory.mapping @@ -1,10 +1,7 @@ CLASS net/minecraft/unmapped/C_aodytokc net/minecraft/recipe/CraftingCategory - FIELD f_ametfgfy category I + FIELD f_ametfgfy id I FIELD f_dnkwjptl name Ljava/lang/String; FIELD f_mmtvuqqz CODEC Lcom/mojang/serialization/Codec; - FIELD f_qbuxqqis INDEX_TO_VALUE Ljava/util/function/IntFunction; + FIELD f_qbuxqqis BY_ID Ljava/util/function/IntFunction; FIELD f_rxkoosdf PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; - METHOD (Ljava/lang/String;ILjava/lang/String;I)V - ARG 3 name - ARG 4 category - METHOD m_snpqsydx getCategory ()I + METHOD m_snpqsydx getId ()I diff --git a/mappings/net/minecraft/registry/BootstrapContext.mapping b/mappings/net/minecraft/registry/BootstrapContext.mapping index 3a1b19e1a0..cc0a3caeb9 100644 --- a/mappings/net/minecraft/registry/BootstrapContext.mapping +++ b/mappings/net/minecraft/registry/BootstrapContext.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/unmapped/C_hqoyyfco net/minecraft/registry/BootstrapContext METHOD m_cajjlsxn getRegistryLookup (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_pzdchrcy; + ARG 1 registry METHOD m_pymxizhb register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 1 key - ARG 2 object + ARG 2 entry METHOD m_vbitvrmt register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 1 key - ARG 2 object + ARG 2 entry ARG 3 lifecycle diff --git a/mappings/net/minecraft/registry/DefaultMappedRegistry.mapping b/mappings/net/minecraft/registry/DefaultMappedRegistry.mapping index 4270c069e4..a9af834dd3 100644 --- a/mappings/net/minecraft/registry/DefaultMappedRegistry.mapping +++ b/mappings/net/minecraft/registry/DefaultMappedRegistry.mapping @@ -2,6 +2,5 @@ CLASS net/minecraft/unmapped/C_qnhgcvtq net/minecraft/registry/DefaultMappedRegi FIELD f_mxvnnuoz id Lnet/minecraft/unmapped/C_ncpywfca; FIELD f_zosutomx holderReference Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; METHOD (Ljava/lang/String;Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/serialization/Lifecycle;Z)V - ARG 1 id ARG 3 lifecycle ARG 4 useIntrusiveHolders diff --git a/mappings/net/minecraft/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/registry/DynamicRegistryManager.mapping index c981da6beb..7793540677 100644 --- a/mappings/net/minecraft/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/registry/DynamicRegistryManager.mapping @@ -9,8 +9,10 @@ CLASS net/minecraft/unmapped/C_wqxmvzdq net/minecraft/registry/DynamicRegistryMa FIELD f_zgajrtqd EMPTY Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd; METHOD m_lxobzcah fromRegistryOfRegistries (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd; ARG 0 key + METHOD m_mkpozqht (Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 registry METHOD m_sloxobqt freeze ()Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd; - METHOD m_vutgtdyk registries ()Ljava/util/stream/Stream; + METHOD m_vutgtdyk streamRegistries ()Ljava/util/stream/Stream; CLASS C_fckcsnok METHOD (Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/stream/Stream;)V ARG 2 entries diff --git a/mappings/net/minecraft/registry/DynamicRegistrySync.mapping b/mappings/net/minecraft/registry/DynamicRegistrySync.mapping index 0a1d2bf50f..3540b2adfe 100644 --- a/mappings/net/minecraft/registry/DynamicRegistrySync.mapping +++ b/mappings/net/minecraft/registry/DynamicRegistrySync.mapping @@ -6,10 +6,20 @@ CLASS net/minecraft/unmapped/C_uhbbwvga net/minecraft/registry/DynamicRegistrySy ARG 4 registryConsumer METHOD m_cakupvxg streamReloadableSyncedRegistries (Lnet/minecraft/unmapped/C_bcpxdrik;)Ljava/util/stream/Stream; ARG 0 registryManager + METHOD m_cjpxffqt (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/util/Set;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;Lcom/mojang/serialization/DynamicOps;Ljava/util/List;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 5 holder + METHOD m_cttmreul (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;Ljava/lang/String;)Ljava/lang/IllegalArgumentException; + ARG 1 errorMessage METHOD m_gnuhreao streamTaggableRegistries (Lnet/minecraft/unmapped/C_bcpxdrik;)Ljava/util/stream/Stream; ARG 0 layeredRegistryManager + METHOD m_kfoqspmu (Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)Z + ARG 0 registry METHOD m_mtiqpvjp forEachSyncedRegistry (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/Set;Ljava/util/function/BiConsumer;)V ARG 2 knownPacks ARG 3 registryConsumer + METHOD m_pacstrfb (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)V + ARG 4 data METHOD m_vcpumcmq streamSyncedRegistries (Lnet/minecraft/unmapped/C_wqxmvzdq;)Ljava/util/stream/Stream; + METHOD m_wzlxyjqc isSynced (Lnet/minecraft/unmapped/C_xhhleach;)Z + ARG 0 registry CLASS C_iikocaff SerializedRegistryEntry diff --git a/mappings/net/minecraft/registry/Holder.mapping b/mappings/net/minecraft/registry/Holder.mapping index 09f15770c0..b117a0b56d 100644 --- a/mappings/net/minecraft/registry/Holder.mapping +++ b/mappings/net/minecraft/registry/Holder.mapping @@ -18,23 +18,23 @@ CLASS net/minecraft/unmapped/C_cjzoxshv net/minecraft/registry/Holder METHOD m_uexsrrou isOwnedBy (Lnet/minecraft/unmapped/C_hkebgttw;)Z ARG 1 owner METHOD m_uwpxznsu streamTags ()Ljava/util/stream/Stream; - METHOD m_ydnvjjng value ()Ljava/lang/Object; + METHOD m_ydnvjjng getValue ()Ljava/lang/Object; + METHOD m_ynppqgwx (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/String; + ARG 0 key METHOD m_znglmuwb getKind ()Lnet/minecraft/unmapped/C_cjzoxshv$C_dflbytmp; CLASS C_dflbytmp Kind CLASS C_rjzpeyec Reference FIELD f_gtphnzhp owner Lnet/minecraft/unmapped/C_hkebgttw; - FIELD f_hhiogamu registryKey Lnet/minecraft/unmapped/C_xhhleach; + FIELD f_hhiogamu key Lnet/minecraft/unmapped/C_xhhleach; FIELD f_lkepjgcv tags Ljava/util/Set; FIELD f_xpbnecjo value Ljava/lang/Object; FIELD f_ziqtcscn type Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec$C_lzllgdpk; - METHOD (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec$C_lzllgdpk;Lnet/minecraft/unmapped/C_hkebgttw;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;)V - ARG 1 type - ARG 2 owner - ARG 4 value METHOD m_fksmldal createIntrusive (Lnet/minecraft/unmapped/C_hkebgttw;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 0 owner ARG 1 value METHOD m_fkurmhix setRegistryKey (Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 key + METHOD m_loesexpf getTags ()Ljava/util/Set; METHOD m_spfiiuqs create (Lnet/minecraft/unmapped/C_hkebgttw;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 0 owner ARG 1 registryKey diff --git a/mappings/net/minecraft/registry/HolderLookup.mapping b/mappings/net/minecraft/registry/HolderLookup.mapping index 0fcf3b7f0a..8943be29b6 100644 --- a/mappings/net/minecraft/registry/HolderLookup.mapping +++ b/mappings/net/minecraft/registry/HolderLookup.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/unmapped/C_vtbxyypo net/minecraft/registry/HolderLookup - METHOD m_cjhuibvn holders ()Ljava/util/stream/Stream; + METHOD m_cjhuibvn streamHolders ()Ljava/util/stream/Stream; METHOD m_pgmbmohw streamTagKeys ()Ljava/util/stream/Stream; METHOD m_rpikeuoc streamTags ()Ljava/util/stream/Stream; METHOD m_vtchccnr streamElementKeys ()Ljava/util/stream/Stream; CLASS C_drwjtlvl RegistryLookup - METHOD m_cplftviu matchesPredicate (Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + METHOD m_cplftviu withFilter (Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + COMMENT @return a view of this lookup with entries filtered by the passed {@code predicate} ARG 1 predicate METHOD m_kqnidhqe enabledIn (Lnet/minecraft/unmapped/C_czxxrbcp;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; ARG 1 featureFlags @@ -12,10 +13,21 @@ CLASS net/minecraft/unmapped/C_vtbxyypo net/minecraft/registry/HolderLookup ARG 1 gatedObject METHOD m_vhaoljfo getRegistryLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD m_wgqigdhk getKey ()Lnet/minecraft/unmapped/C_xhhleach; - CLASS C_jyxfuyee Delegate - METHOD m_smgukdep lookup ()Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + CLASS C_epoknvca + METHOD m_siwozrxd (Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z + ARG 1 holder + METHOD m_ysslswxl (Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Z + ARG 1 holder + CLASS C_jyxfuyee Delegating + METHOD m_smgukdep getDelegate ()Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; CLASS C_etmlgbig Provider METHOD m_dnidhibf create (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; ARG 0 lookups - METHOD m_pbceiquw streamRegistryKeys ()Ljava/util/stream/Stream; + METHOD m_hlpdjttt getLifecycle ()Lcom/mojang/serialization/Lifecycle; + COMMENT @return the {@link com.mojang.serialization.Lifecycle lifecycle} for this provider, + COMMENT determined by the least-stable lifecycle amongst its {@link #streamLookups lookups} + METHOD m_pbceiquw streamLookups ()Ljava/util/stream/Stream; METHOD m_uwaazyzq createSerializationContext (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/unmapped/C_piadqmzm; + METHOD m_vwprjgpp streamRegistryKeys ()Ljava/util/stream/Stream; + METHOD m_wwvmnchf (Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + ARG 0 lookup diff --git a/mappings/net/minecraft/registry/HolderProvider.mapping b/mappings/net/minecraft/registry/HolderProvider.mapping index 13d4729449..e198435295 100644 --- a/mappings/net/minecraft/registry/HolderProvider.mapping +++ b/mappings/net/minecraft/registry/HolderProvider.mapping @@ -19,7 +19,6 @@ CLASS net/minecraft/unmapped/C_pzdchrcy net/minecraft/registry/HolderProvider METHOD m_yyleelhl getHolder (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; COMMENT {@return the holder by its key, may be empty if the entry does not exist in this provider} ARG 1 key - COMMENT they key of the holder CLASS C_pbvqpmst Provider METHOD m_dplmvldg (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_pzdchrcy;)Ljava/util/Optional; ARG 1 lookup @@ -27,12 +26,10 @@ CLASS net/minecraft/unmapped/C_pzdchrcy net/minecraft/registry/HolderProvider COMMENT {@return the holder provider of the given registry} COMMENT COMMENT @throws IllegalStateException if the registry does not exist in this provider - ARG 1 registryKey - COMMENT the key of the registry + ARG 1 registry METHOD m_hyoezddu getLookup (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; COMMENT {@return the holder provider of the given registry, may be empty if the registry does not exist in this provider} - ARG 1 registryKey - COMMENT the key of the registry + ARG 1 registry METHOD m_yuymjcux get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; COMMENT {@return the entry's holder by its key, may be empty if the entry does not exist in the searched registry} ARG 1 registry diff --git a/mappings/net/minecraft/registry/HolderSet.mapping b/mappings/net/minecraft/registry/HolderSet.mapping index 9083e16945..f9854e731e 100644 --- a/mappings/net/minecraft/registry/HolderSet.mapping +++ b/mappings/net/minecraft/registry/HolderSet.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/unmapped/C_odfnijdo net/minecraft/registry/HolderSet ARG 0 contents METHOD m_dneqvpzw ownedBy (Lnet/minecraft/unmapped/C_hkebgttw;)Z ARG 1 owner + METHOD m_ebrshnnp isBound ()Z METHOD m_fewclxfb getTag ()Ljava/util/Optional; METHOD m_fzxplshe direct (Ljava/util/function/Function;Ljava/util/Collection;)Lnet/minecraft/unmapped/C_odfnijdo$C_zmwjwbow; ARG 0 mapper @@ -35,11 +36,9 @@ CLASS net/minecraft/unmapped/C_odfnijdo net/minecraft/registry/HolderSet ARG 1 owner ARG 2 key METHOD m_lvlpmfrg getKey ()Lnet/minecraft/unmapped/C_ednuhnnn; - METHOD m_zaedbqzo setContents (Ljava/util/List;)V + METHOD m_zaedbqzo bindTo (Ljava/util/List;)V ARG 1 contents CLASS C_zmwjwbow DirectSet FIELD f_sggtnbos contents Ljava/util/List; FIELD f_wamwqcjf contentsSet Ljava/util/Set; FIELD f_zqgrcisv EMPTY Lnet/minecraft/unmapped/C_odfnijdo$C_zmwjwbow; - METHOD (Ljava/util/List;)V - ARG 1 contents diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping index 5a7b727aa5..60ed76fd83 100644 --- a/mappings/net/minecraft/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/registry/MutableRegistry.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/unmapped/C_eexxncvi net/minecraft/registry/MutableRegistry + METHOD m_eneptwjq bindTag (Lnet/minecraft/unmapped/C_ednuhnnn;Ljava/util/List;)V + ARG 2 contents 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;Lnet/minecraft/unmapped/C_jhxfjegj;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 844d84d7cc..68c9749d30 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -64,16 +64,27 @@ CLASS net/minecraft/unmapped/C_nusqeapl net/minecraft/registry/Registries FIELD f_zjshyqas DENSITY_FUNCTION Lnet/minecraft/unmapped/C_tqxyjqsk; FIELD f_zrzntavz BLOCK_ENTITY_TYPE Lnet/minecraft/unmapped/C_tqxyjqsk; FIELD f_zydiinmc TRUNK_PLACER_TYPE Lnet/minecraft/unmapped/C_tqxyjqsk; + METHOD m_eabwmwqn bindTagsToEmpty (Lnet/minecraft/unmapped/C_tqxyjqsk;)V METHOD m_fgyhnhhd freeze ()V METHOD m_grgbvblx createDefaultMappedUnfrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_zogerkic; + ARG 0 key METHOD m_gwxfieow createSimpleUnfrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_tqxyjqsk; + ARG 0 key METHOD m_hhgwdqyg internalRegister (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_eexxncvi; + ARG 0 registry ARG 1 entry ARG 2 bootstrap METHOD m_lzhvsneq createDefaultMappedFrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_zogerkic; + ARG 0 key METHOD m_mwsegmux bootstrap ()V + METHOD m_ouwxdits (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/function/Supplier;)V + ARG 1 bootstrapper METHOD m_sgrkhfqj validate (Lnet/minecraft/unmapped/C_tqxyjqsk;)V - ARG 0 registries + ARG 0 root + METHOD m_uavjgjwm getHolderProvider (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_pzdchrcy; + METHOD m_ujzdknrq (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_tqxyjqsk;)V + ARG 1 registry METHOD m_ybecmlwo createContents ()V METHOD m_ydemdayj createSimpleFrozenRegistry (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nusqeapl$C_qpkaxgeh;)Lnet/minecraft/unmapped/C_tqxyjqsk; + ARG 0 key CLASS C_qpkaxgeh RegistryBootstrap diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index f12a6fdca5..c1c96f6eaf 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -1,16 +1,27 @@ CLASS net/minecraft/unmapped/C_tqxyjqsk net/minecraft/registry/Registry METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 dynamicOps + METHOD m_aeqgxwbv (Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 value + METHOD m_auupvvtk getOrThrow (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/Object; + ARG 1 key + METHOD m_blmrlzel (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lnet/minecraft/unmapped/C_cjzoxshv; + ARG 0 reference METHOD m_bpoptgww wrapAsHolder (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv; ARG 1 entry METHOD m_cjwbheqc getKey (Ljava/lang/Object;)Ljava/util/Optional; ARG 1 entry METHOD m_ckzkjowv getKeys ()Ljava/util/Set; METHOD m_dixnzblu createIntrusiveHolder (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; - ARG 1 holder + ARG 1 entry METHOD m_fiunuwfp freeze ()Lnet/minecraft/unmapped/C_tqxyjqsk; + METHOD m_hnixtpdg find (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional; + METHOD m_ifyosden get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/Object; + ARG 1 key METHOD m_ikxlhrge getOrEmpty (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; ARG 1 key + METHOD m_iotvxcay find (I)Ljava/util/Optional; + ARG 1 rawId METHOD m_jktnfzok registerHolder (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 0 registry ARG 1 id @@ -18,8 +29,12 @@ CLASS net/minecraft/unmapped/C_tqxyjqsk net/minecraft/registry/Registry METHOD m_keyttxmd getTagOrEmpty (Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/lang/Iterable; ARG 1 tag METHOD m_ksueyykv getReferenceHolderWithLifecycle ()Lcom/mojang/serialization/Codec; + METHOD m_kxeijgiq get (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/lang/Object; METHOD m_leajtcub stream ()Ljava/util/stream/Stream; + METHOD m_ltdpyfam (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lcom/mojang/serialization/Lifecycle; + ARG 1 reference METHOD m_nlhggctm getRegistrationInfo (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 key METHOD m_nqhcjajy register (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id @@ -27,6 +42,8 @@ CLASS net/minecraft/unmapped/C_tqxyjqsk net/minecraft/registry/Registry METHOD m_nqoydeav getEntries ()Ljava/util/Set; METHOD m_nzuihlla getRandomElement (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_rlomrsco;)Ljava/util/Optional; METHOD m_pquqhkot holderByNameCodec ()Lcom/mojang/serialization/Codec; + METHOD m_prsibeni startTagReload (Lnet/minecraft/unmapped/C_loluvnda$C_shtfmyxy;)Lnet/minecraft/unmapped/C_tqxyjqsk$C_dbbudibo; + ARG 1 registryTags METHOD m_pvyfqcdo getCodec ()Lcom/mojang/serialization/Codec; METHOD m_qeyctvgm asHolderIdMap ()Lnet/minecraft/unmapped/C_feaetnaz; METHOD m_qkhirdbw validateReference (Lnet/minecraft/unmapped/C_cjzoxshv;)Lcom/mojang/serialization/DataResult; @@ -43,15 +60,26 @@ CLASS net/minecraft/unmapped/C_tqxyjqsk net/minecraft/registry/Registry ARG 2 entry METHOD m_vnyaisgo getOrEmpty (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/Optional; ARG 1 id - METHOD m_vongjcbr getAny ()Ljava/util/Optional; + METHOD m_vongjcbr findAny ()Ljava/util/Optional; METHOD m_vqpjfuha getId (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_ncpywfca; ARG 1 entry - METHOD m_wicxsqqn getTags ()Ljava/util/stream/Stream; + METHOD m_vzcxipcd (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 reference + METHOD m_wicxsqqn streamBoundTags ()Ljava/util/stream/Stream; METHOD m_wvmzcded registryHolder (Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; ARG 0 registry ARG 1 key ARG 2 entry + METHOD m_wvztvxeq (Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)Ljava/util/Optional; + ARG 1 values METHOD m_xyrkdyzg register (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 id ARG 2 entry + CLASS C_civshlgy + METHOD m_timkjzrb (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Lnet/minecraft/unmapped/C_cjzoxshv; + ARG 0 holder + CLASS C_dbbudibo PendingTags + METHOD m_lucdhycj bind ()V + METHOD m_pipptaec getLookup ()Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + METHOD m_spczqdtt getKey ()Lnet/minecraft/unmapped/C_xhhleach; diff --git a/mappings/net/minecraft/registry/RegistryCloner.mapping b/mappings/net/minecraft/registry/RegistryCloner.mapping index 81e8ea8604..13484f9a83 100644 --- a/mappings/net/minecraft/registry/RegistryCloner.mapping +++ b/mappings/net/minecraft/registry/RegistryCloner.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/unmapped/C_nlcdnclu net/minecraft/registry/RegistryCloner + METHOD m_qklykybk (Ljava/lang/String;)Ljava/lang/IllegalStateException; + ARG 0 errorMessage + METHOD m_qycjgtcz (Ljava/lang/String;)Ljava/lang/IllegalStateException; + ARG 0 errorMessage METHOD m_zduexkww clone (Ljava/lang/Object;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/lang/Object; ARG 1 value ARG 2 subsetLookupProvider ARG 3 fullLookupProvider CLASS C_bxhpbcyq CloneableRegistries - FIELD f_naqxvgob registries Ljava/util/Map; + FIELD f_naqxvgob cloners Ljava/util/Map; METHOD m_dtbyqapc with (Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_nlcdnclu$C_bxhpbcyq; + ARG 1 registry METHOD m_lmwgprcv get (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_nlcdnclu; + ARG 1 registry diff --git a/mappings/net/minecraft/registry/RegistryKey.mapping b/mappings/net/minecraft/registry/RegistryKey.mapping index 364a95b421..8a387924e7 100644 --- a/mappings/net/minecraft/registry/RegistryKey.mapping +++ b/mappings/net/minecraft/registry/RegistryKey.mapping @@ -15,7 +15,8 @@ CLASS net/minecraft/unmapped/C_xhhleach net/minecraft/registry/RegistryKey METHOD m_achtcauh (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach; ARG 1 value METHOD m_acppaety registryKey ()Lnet/minecraft/unmapped/C_xhhleach; - METHOD m_bbzwrvpr packetCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu; + METHOD m_bbzwrvpr createPacketCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu; + ARG 0 registry METHOD m_fvrtwzrl of (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach; COMMENT Creates a registry key for a value in a registry with a registry key for COMMENT the value-holding registry in the root registry and an identifier of the @@ -37,8 +38,8 @@ CLASS net/minecraft/unmapped/C_xhhleach net/minecraft/registry/RegistryKey COMMENT Returns whether this registry key belongs to the given registry (according to its type, not whether the registry actually contains this key). ARG 1 registry COMMENT the key of the registry that this registry key should be inside - METHOD m_omukrpmi codec (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/Codec; - ARG 0 key + METHOD m_omukrpmi createCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/Codec; + ARG 0 registry METHOD m_puwkoaeq ofRegistry (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach; COMMENT Creates a registry key for a registry in the root registry (registry of COMMENT all registries) with an identifier for the registry. @@ -54,6 +55,6 @@ CLASS net/minecraft/unmapped/C_xhhleach net/minecraft/registry/RegistryKey METHOD m_tbhhljwv getRegistry ()Lnet/minecraft/unmapped/C_ncpywfca; METHOD m_xhwzyssj (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_xhhleach; ARG 1 id - METHOD m_yomlikvd cast (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + METHOD m_yomlikvd castTo (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; ARG 1 registry CLASS C_gdrqkfgh InternKey diff --git a/mappings/net/minecraft/registry/RegistryKeys.mapping b/mappings/net/minecraft/registry/RegistryKeys.mapping index 68200a9db5..bec3bd62ef 100644 --- a/mappings/net/minecraft/registry/RegistryKeys.mapping +++ b/mappings/net/minecraft/registry/RegistryKeys.mapping @@ -88,8 +88,12 @@ CLASS net/minecraft/unmapped/C_msgswxvc net/minecraft/registry/RegistryKeys FIELD f_yvlnvzna GAME_EVENT Lnet/minecraft/unmapped/C_xhhleach; FIELD f_zgbgqibe PLACEMENT_MODIFIER_TYPE Lnet/minecraft/unmapped/C_xhhleach; METHOD m_bdariitd getTagDirectory (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/String; + ARG 0 registry METHOD m_gtztdwoq asWorldKey (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 dimensionOptions METHOD m_hnrinasr createRegistryKey (Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach; ARG 0 id METHOD m_oinrvkni asDimensionKey (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 world METHOD m_zcwdptpx getDirectory (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/lang/String; + ARG 0 registry diff --git a/mappings/net/minecraft/registry/RegistryLoader.mapping b/mappings/net/minecraft/registry/RegistryLoader.mapping index ba0a8a23e8..4c0e9fe7ad 100644 --- a/mappings/net/minecraft/registry/RegistryLoader.mapping +++ b/mappings/net/minecraft/registry/RegistryLoader.mapping @@ -3,39 +3,86 @@ CLASS net/minecraft/unmapped/C_ratuauki net/minecraft/registry/RegistryLoader FIELD f_jezobqyr SYNCED_REGISTRIES Ljava/util/List; FIELD f_mbwjyulc WORLDGEN_REGISTRIES Ljava/util/List; FIELD f_mwvwmgqu REGISTRATION_INFO_CACHE Ljava/util/function/Function; + FIELD f_ojcgnnbc KEY_COMPARATOR Ljava/util/Comparator; FIELD f_ytrbmnwo DIMENSION_REGISTRIES Ljava/util/List; - METHOD m_bszcilsu printExceptions (Ljava/util/Map;)Lnet/minecraft/unmapped/C_zmbivxlv; + METHOD m_bszcilsu logAndCreateCrashException (Ljava/util/Map;)Lnet/minecraft/unmapped/C_zmbivxlv; ARG 0 collectedExceptions + METHOD m_colxglbr (Ljava/util/Map;Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv;)V + ARG 1 loader + METHOD m_dpiyppgl (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)V + ARG 1 contentLoader + ARG 2 infoLookup + METHOD m_dzsznngh (Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 entry METHOD m_etwoconu loadFromManager (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;Lnet/minecraft/unmapped/C_eexxncvi;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V ARG 2 registry ARG 3 elementDecoder ARG 4 errors + METHOD m_gffqfamt (Ljava/util/Map;Lnet/minecraft/unmapped/C_ratuauki$C_qpshoosu;)Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv; + ARG 1 registryData + METHOD m_gperoudv (Ljava/util/Map;Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv;)V + ARG 1 contentLoader + METHOD m_guprgboh (Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 entry + METHOD m_hozhswck (Ljava/lang/Boolean;)Lcom/mojang/serialization/Lifecycle; + ARG 0 unused + METHOD m_icshdwsu (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V + ARG 1 registryElementExceptions METHOD m_iulkejcw createInfoForNewRegistry (Lnet/minecraft/unmapped/C_eexxncvi;)Lnet/minecraft/unmapped/C_piadqmzm$C_sznlrmbg; ARG 0 registry + METHOD m_jqrxkesh load (Lnet/minecraft/unmapped/C_ratuauki$C_kprmzsuj;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd; + ARG 0 loadingFunction + ARG 2 registryDatas + METHOD m_lcaitrsg (Ljava/util/Map;Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)V + ARG 1 lookup + METHOD m_lxzhrmte loadFromNetwork (Ljava/util/Map;Lnet/minecraft/unmapped/C_xadhkzfq;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd; + ARG 0 entries + ARG 1 factory METHOD m_mcjxwvrf createContext (Ljava/util/List;Ljava/util/List;)Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl; - ARG 0 registriesAndLoaders + ARG 0 lookups + ARG 1 contentLoaders + METHOD m_mhfvkskx (Lnet/minecraft/unmapped/C_ratuauki$C_kprmzsuj;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv;)V + ARG 2 contentLoader METHOD m_mzzokuhr loadElementFromResource (Lnet/minecraft/unmapped/C_eexxncvi;Lcom/mojang/serialization/Decoder;Lnet/minecraft/unmapped/C_piadqmzm;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_tuynegco;Lnet/minecraft/unmapped/C_jhxfjegj;)V ARG 0 registry ARG 1 decoder ARG 2 ops ARG 4 resource + METHOD m_nfxbkpmx (Ljava/util/Map;Lnet/minecraft/unmapped/C_xadhkzfq;Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)V + ARG 2 contentLoader + ARG 3 infoLookup + METHOD m_npgdgrqs createCrashException (Ljava/util/Map;)Lnet/minecraft/unmapped/C_zmbivxlv; + ARG 0 collectedExceptions + METHOD m_rbymmjgv (Ljava/io/PrintWriter;Ljava/util/Map$Entry;)V + ARG 1 elementException METHOD m_rlsjdntz createInfoForContextRegistry (Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_piadqmzm$C_sznlrmbg; + ARG 0 lookup + METHOD m_rxpksoew (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_jhxfjegj; + ARG 0 pack METHOD m_sqqlbqim loadFromNetwork (Ljava/util/Map;Lnet/minecraft/unmapped/C_xadhkzfq;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;Lnet/minecraft/unmapped/C_eexxncvi;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V ARG 0 entries ARG 1 factory ARG 3 registry ARG 4 elementDecoder ARG 5 errors + METHOD m_vdmamojt loadFromResource (Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd; + METHOD m_xnajouwy logExceptions (Ljava/util/Map;)V + ARG 0 collectedExceptions + METHOD m_zgjrdisl (Ljava/lang/StringBuilder;Ljava/util/Map$Entry;)V + ARG 1 entry CLASS C_kfdvqtiv ContentLoader METHOD m_cclfkymr loadFromNetwork (Ljava/util/Map;Lnet/minecraft/unmapped/C_xadhkzfq;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)V METHOD m_lvoknnbl loadFromResource (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)V CLASS C_kprmzsuj LoadingFunction - METHOD apply (Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)V + METHOD apply load (Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)V ARG 1 loader ARG 2 infoLookup CLASS C_qpshoosu DecodingData + FIELD f_wwrfheei registry Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_azjxntab registry ()Lnet/minecraft/unmapped/C_xhhleach; METHOD m_qoqcvblw runWithData (Ljava/util/function/BiConsumer;)V ARG 1 consumer METHOD m_qxfeaogn createRegistryAndLoader (Lcom/mojang/serialization/Lifecycle;Ljava/util/Map;)Lnet/minecraft/unmapped/C_ratuauki$C_kfdvqtiv; ARG 1 lifecycle ARG 2 collectedExceptions + CLASS C_zhgblbig NetworkEntries diff --git a/mappings/net/minecraft/registry/RegistryOps.mapping b/mappings/net/minecraft/registry/RegistryOps.mapping index 064820d9a7..6a2c0541b6 100644 --- a/mappings/net/minecraft/registry/RegistryOps.mapping +++ b/mappings/net/minecraft/registry/RegistryOps.mapping @@ -2,19 +2,37 @@ CLASS net/minecraft/unmapped/C_piadqmzm net/minecraft/registry/RegistryOps FIELD f_vdicfwsi infoLookup Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl; METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)V ARG 2 infoLookup + METHOD m_bckocqhu (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_piadqmzm$C_sznlrmbg;)Ljava/util/Optional; + ARG 1 info METHOD m_cbajopsh withRegistry (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lcom/mojang/serialization/Dynamic; ARG 1 lookupProvider METHOD m_cbpcvxox create (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_piadqmzm; ARG 1 provider - METHOD m_csmsiyjj retrieveElement (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + METHOD m_csmsiyjj createElementVerifier (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + ARG 0 element + METHOD m_hwvsonxs (Lnet/minecraft/unmapped/C_piadqmzm$C_sznlrmbg;)Lcom/mojang/serialization/DataResult; + ARG 0 info + METHOD m_kftazkdh (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 0 ignored METHOD m_pztmqyhp getHolderProvider (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 registry + METHOD m_skdgkhyw (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_pzdchrcy; + ARG 0 ignored METHOD m_ullsawcn getOwner (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 registry METHOD m_uvzmikbu withDelegate (Lcom/mojang/serialization/DynamicOps;)Lnet/minecraft/unmapped/C_piadqmzm; METHOD m_vbfmluid create (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/unmapped/C_piadqmzm$C_raywzonl;)Lnet/minecraft/unmapped/C_piadqmzm; ARG 1 infoLookup - METHOD m_yxpznfcj retrieveGetter (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + METHOD m_yxpznfcj createRegistryVerifier (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/codecs/RecordCodecBuilder; + ARG 0 registry CLASS C_raywzonl RegistryInfoLookup - METHOD m_vxddufef lookup (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + METHOD m_vxddufef getInfo (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 registry CLASS C_sznlrmbg RegistryInfo METHOD m_kblhssdn create (Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_piadqmzm$C_sznlrmbg; ARG 0 lookup + CLASS C_tbnrbtat MemoizedInfoLookup + FIELD f_weufdavy registryInfos Ljava/util/Map; + FIELD f_znfdfzvf provider Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; + METHOD m_rakmcorl createRegistryInfo (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 registry diff --git a/mappings/net/minecraft/registry/RegistrySetBuilder.mapping b/mappings/net/minecraft/registry/RegistrySetBuilder.mapping index 51daa5ee63..a2e05e5ba7 100644 --- a/mappings/net/minecraft/registry/RegistrySetBuilder.mapping +++ b/mappings/net/minecraft/registry/RegistrySetBuilder.mapping @@ -3,7 +3,18 @@ CLASS net/minecraft/unmapped/C_tncydixy net/minecraft/registry/RegistrySetBuilde METHOD m_caorxpdk createState (Lnet/minecraft/unmapped/C_wqxmvzdq;)Lnet/minecraft/unmapped/C_tncydixy$C_xxpyvqyn; METHOD m_copcctyu buildPatch (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_nlcdnclu$C_bxhpbcyq;)Lnet/minecraft/unmapped/C_tncydixy$C_ieiskvte; ARG 2 provider + METHOD m_dalaoixn (Lnet/minecraft/unmapped/C_tncydixy$C_xxpyvqyn;Lnet/minecraft/unmapped/C_tncydixy$C_svehzhem;)V + ARG 1 entry + METHOD m_domwtxfw (Ljava/util/Map;Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)V + ARG 1 registry + METHOD m_eahljcxs (Lnet/minecraft/unmapped/C_tncydixy$C_xxpyvqyn;Lnet/minecraft/unmapped/C_tncydixy$C_svehzhem;)Lnet/minecraft/unmapped/C_tncydixy$C_ibrokpip; + ARG 1 entry + METHOD m_ebzwugfl (Ljava/util/Map;Lnet/minecraft/unmapped/C_tncydixy$C_ibrokpip;)V + ARG 1 contents + METHOD m_fubmiija (Lnet/minecraft/unmapped/C_hkebgttw;Lnet/minecraft/unmapped/C_nlcdnclu;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lorg/apache/commons/lang3/mutable/MutableObject;Ljava/util/Map;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 5 holder METHOD m_fuvpcytb add (Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/unmapped/C_tncydixy$C_nxwigvql;)Lnet/minecraft/unmapped/C_tncydixy; + ARG 1 registry ARG 2 lifecycle ARG 3 bootstrap METHOD m_iaaetqhl build (Lnet/minecraft/unmapped/C_wqxmvzdq;)Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; @@ -17,19 +28,39 @@ CLASS net/minecraft/unmapped/C_tncydixy net/minecraft/registry/RegistrySetBuilde ARG 2 lookups METHOD m_kkeolqvv applyPatches (Lnet/minecraft/unmapped/C_hkebgttw;Lnet/minecraft/unmapped/C_nlcdnclu$C_bxhpbcyq;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lorg/apache/commons/lang3/mutable/MutableObject;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; ARG 2 cloneableRegistries + ARG 3 registry ARG 4 patchLookupProvider ARG 5 baseLookupProvider ARG 6 lazyWrapper + METHOD m_lyxtrygr (Ljava/util/Map;Lnet/minecraft/unmapped/C_hkebgttw;Lnet/minecraft/unmapped/C_nlcdnclu;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 5 holder METHOD m_neszlanl add (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_tncydixy$C_nxwigvql;)Lnet/minecraft/unmapped/C_tncydixy; ARG 2 bootstrap + METHOD m_qibtoybu (Lnet/minecraft/unmapped/C_tncydixy$C_xxpyvqyn;Lnet/minecraft/unmapped/C_tncydixy$C_svehzhem;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + ARG 1 entry + METHOD m_scgbjiwa (Ljava/util/Map;Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 newKey + METHOD m_sioqyyhc (Lnet/minecraft/unmapped/C_hkebgttw;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_nlcdnclu;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 6 unused METHOD m_toqvdyew createLookup (Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/serialization/Lifecycle;Lnet/minecraft/unmapped/C_hkebgttw;Ljava/util/Map;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + ARG 0 registry ARG 1 lifecycle ARG 2 owner ARG 3 entries METHOD m_uhodzprv wrapLookup (Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Lnet/minecraft/unmapped/C_pzdchrcy; ARG 0 lookup + METHOD m_xqipycnd (Lnet/minecraft/unmapped/C_tncydixy$C_xxpyvqyn;Lnet/minecraft/unmapped/C_tncydixy$C_ibrokpip;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + ARG 1 contents + METHOD m_xrtdcnhf (Ljava/util/Set;Lnet/minecraft/unmapped/C_xhhleach;)Z + ARG 1 key + METHOD m_zgqtqvil (Lnet/minecraft/unmapped/C_tncydixy$C_mydfhsyb;Lnet/minecraft/unmapped/C_nlcdnclu$C_bxhpbcyq;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; + ARG 6 key + METHOD m_ztcemixv (Ljava/util/Map;Lnet/minecraft/unmapped/C_tncydixy$C_mydfhsyb;Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)V + ARG 2 lookup CLASS C_dzakpbmy RegisteredValue CLASS C_ibrokpip RegistryContents + METHOD m_eadidwoq (Lnet/minecraft/unmapped/C_tncydixy$C_mydfhsyb;Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 1 entry METHOD m_zsotplrt buildLookup (Lnet/minecraft/unmapped/C_tncydixy$C_mydfhsyb;)Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl; ARG 1 owner CLASS C_ieiskvte PatchedRegistries @@ -59,15 +90,26 @@ CLASS net/minecraft/unmapped/C_tncydixy net/minecraft/registry/RegistrySetBuilde ARG 1 owner CLASS C_vcrasote METHOD m_bpnnoeac get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 registry CLASS C_vmdfhvom LazyHolder FIELD f_rekjfnjh supplier Ljava/util/function/Supplier; CLASS C_xlkunjxh UniversalLookup FIELD f_nkjpmpim holders Ljava/util/Map; + METHOD m_awntyuiu (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 1 registryKey METHOD m_kwtahmdp getOrCreate (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 1 entry CLASS C_xxpyvqyn BuildState METHOD m_gaysgpxx reportOrphanedValues ()V METHOD m_hfvtdxvs create (Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_tncydixy$C_xxpyvqyn; ARG 1 registryKeys + METHOD m_lropqxkl (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)V + ARG 1 registry + METHOD m_oavbqqfj (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/unmapped/C_tncydixy$C_xlkunjxh;Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 2 key + METHOD m_qjvbanwd (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_tncydixy$C_dzakpbmy;)V + ARG 1 key + ARG 2 value METHOD m_szmfjjcg createBootstrapContext ()Lnet/minecraft/unmapped/C_hqoyyfco; METHOD m_xtitxxee thrownOnError ()V METHOD m_zcbyprjs reportUnreferencedKeys ()V diff --git a/mappings/net/minecraft/registry/ReloadableRegistries.mapping b/mappings/net/minecraft/registry/ReloadableRegistries.mapping index 72c052e1a9..da3ba90aec 100644 --- a/mappings/net/minecraft/registry/ReloadableRegistries.mapping +++ b/mappings/net/minecraft/registry/ReloadableRegistries.mapping @@ -1,14 +1,42 @@ CLASS net/minecraft/unmapped/C_ihseotxf net/minecraft/registry/ReloadableRegistries FIELD f_tziodfyh DEFAULT_REGISTRATION_INFO Lnet/minecraft/unmapped/C_jhxfjegj; + METHOD m_acrcsyqu (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_gvzqwcwq;)V + ARG 2 type + METHOD m_aindcziu (Lnet/minecraft/unmapped/C_gvzqwcwq;Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 2 holder + METHOD m_cfqjucpo validateLootTables (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V + METHOD m_crrtxhwv (Lnet/minecraft/unmapped/C_bcpxdrik;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/List;)Lnet/minecraft/unmapped/C_ihseotxf$C_ssgyvsmu; + ARG 2 registries + METHOD m_gmumfwja combine (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; + ARG 0 provider1 + ARG 1 provider2 + METHOD m_icvhregi (Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_gvzqwcwq;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/Object;)V + ARG 3 t METHOD m_nnifhcon reload (Lnet/minecraft/unmapped/C_bcpxdrik;Ljava/util/List;Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 registryManager + METHOD m_obfpvgib (Ljava/lang/String;Ljava/lang/String;)V + ARG 0 path + ARG 1 error + METHOD m_rdbtrkuh loadRegistries (Lnet/minecraft/unmapped/C_bcpxdrik;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/List;)Lnet/minecraft/unmapped/C_ihseotxf$C_ssgyvsmu; + ARG 1 provider + METHOD m_shrzagne (Lnet/minecraft/unmapped/C_piadqmzm;Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;Lnet/minecraft/unmapped/C_gvzqwcwq;)Ljava/util/concurrent/CompletableFuture; + ARG 3 type METHOD m_spiepebv withUpdatedRegistries (Lnet/minecraft/unmapped/C_bcpxdrik;Ljava/util/List;)Lnet/minecraft/unmapped/C_bcpxdrik; ARG 0 registryManager - METHOD m_xrkbdssc validateRegistry (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_gvzqwcwq;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V + METHOD m_tyznbqtt loadRegistry (Lnet/minecraft/unmapped/C_gvzqwcwq;Lnet/minecraft/unmapped/C_piadqmzm;Lnet/minecraft/unmapped/C_tmnrpasf;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 type + ARG 1 jsonOps + METHOD m_xrkbdssc validateLootTablesImpl (Lnet/minecraft/unmapped/C_eumtgsbp;Lnet/minecraft/unmapped/C_gvzqwcwq;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V ARG 0 reporter ARG 1 lootDataType + ARG 2 dataLookup CLASS C_hnvzydbq Holder FIELD f_uxidcgck registryManager Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig; + METHOD m_gruofcqz (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_vtbxyypo$C_drwjtlvl;)Ljava/util/Optional; + ARG 1 lootLookup METHOD m_lrvgvrfo getIds (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Collection; + ARG 1 registry METHOD m_rgbjhfac getLootTable (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_inwsuliy; + ARG 1 key METHOD m_ssljecqh createLookupProvider ()Lnet/minecraft/unmapped/C_pzdchrcy$C_pbvqpmst; + CLASS C_ssgyvsmu LoadResult diff --git a/mappings/net/minecraft/registry/SimpleRegistry.mapping b/mappings/net/minecraft/registry/SimpleRegistry.mapping index 870344c14b..9f9ddcf10d 100644 --- a/mappings/net/minecraft/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/registry/SimpleRegistry.mapping @@ -4,20 +4,71 @@ CLASS net/minecraft/unmapped/C_secmvxxe net/minecraft/registry/SimpleRegistry FIELD f_kyghykib rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList; FIELD f_mxojfjuq keyToRegistrationInfo Ljava/util/Map; FIELD f_ntcgjudy lifecycle Lcom/mojang/serialization/Lifecycle; + FIELD f_onmwzliz key Lnet/minecraft/unmapped/C_xhhleach; FIELD f_oyicsmaj byId Ljava/util/Map; + FIELD f_tbjdirup tags Ljava/util/Map; FIELD f_tmrvgtrj entryToRawId Lit/unimi/dsi/fastutil/objects/Reference2IntMap; FIELD f_vizxqybx byKey Ljava/util/Map; + FIELD f_ynokispn tagBinding Lnet/minecraft/unmapped/C_secmvxxe$C_yoxjbwwh; FIELD f_ytdkeyex frozen Z METHOD (Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/serialization/Lifecycle;)V ARG 2 lifecycle METHOD (Lnet/minecraft/unmapped/C_xhhleach;Lcom/mojang/serialization/Lifecycle;Z)V - ARG 1 key ARG 2 lifecycle ARG 3 useIntrusiveHolders + METHOD m_begeftaf (Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)V + ARG 0 tag + METHOD m_cdbgcbew (Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 unbound + METHOD m_diftscqc (Ljava/util/Map$Entry;)Z + ARG 0 entry + METHOD m_fedltpia (Lcom/google/common/collect/ImmutableMap$Builder;Ljava/util/Map;Lnet/minecraft/unmapped/C_ednuhnnn;Ljava/util/List;)V + ARG 3 tagKey + ARG 4 contents + METHOD m_fgflmyyk (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 1 registryKey + METHOD m_fmjzgjfu (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 1 registryKey METHOD m_gqfaubze requireNotFrozen ()V + METHOD m_gyjyxear refreshByKey ()V + METHOD m_kdrvxewn (Ljava/util/Map;Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)V + ARG 2 key + ARG 3 tag + METHOD m_kgnrhaoz (Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_ncpywfca; + ARG 0 unbound + METHOD m_mvpkkzyf bindTagsToEmpty ()V METHOD m_myvytbrr createTag (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu; ARG 1 key + METHOD m_ndsbyjne getOrCreateTag (Lnet/minecraft/unmapped/C_ednuhnnn;)Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu; + ARG 1 key METHOD m_nikmvqdb getOrCreateHolderOrThrow (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + METHOD m_pmewrdcl (Ljava/util/Map;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 1 reference + METHOD m_pqtwoern (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V + ARG 0 map + METHOD m_sskehwlu requireOwnedReference (Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 2 holder + METHOD m_utkjswei (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec; + ARG 1 t + METHOD m_uxxmjbws (Ljava/util/Map$Entry;)Z + ARG 0 entry METHOD m_vnznjtqt requireNotFrozen (Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 entryKey METHOD m_xynptmgp getValueFromNullable (Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)Ljava/lang/Object; ARG 0 reference + METHOD m_zidmplwf (Ljava/lang/Object;Lnet/minecraft/unmapped/C_cjzoxshv$C_rjzpeyec;)V + ARG 0 value + ARG 1 reference + CLASS C_hicdurkx + METHOD m_erbhfglg (Ljava/util/Map;Lnet/minecraft/unmapped/C_ednuhnnn;Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)V + ARG 1 key + ARG 2 tag + CLASS C_yoxjbwwh TagBinding + METHOD m_gmncclhh forEach (Ljava/util/function/BiConsumer;)V + ARG 1 tagConsumer + METHOD m_gssqepda createBound (Ljava/util/Map;)Lnet/minecraft/unmapped/C_secmvxxe$C_yoxjbwwh; + ARG 0 tags + METHOD m_olzjqlsq createUnbound ()Lnet/minecraft/unmapped/C_secmvxxe$C_yoxjbwwh; + METHOD m_pwfplpoh stream ()Ljava/util/stream/Stream; + METHOD m_wikjbukt isBound ()Z + METHOD m_xuztrjlm get (Lnet/minecraft/unmapped/C_ednuhnnn;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/registry/tag/TagEntry.mapping b/mappings/net/minecraft/registry/tag/TagEntry.mapping index 90a03bb802..21276924f7 100644 --- a/mappings/net/minecraft/registry/tag/TagEntry.mapping +++ b/mappings/net/minecraft/registry/tag/TagEntry.mapping @@ -36,6 +36,8 @@ CLASS net/minecraft/unmapped/C_rfhbnify net/minecraft/registry/tag/TagEntry METHOD m_swtlbreu visitOptionalDependencies (Ljava/util/function/Consumer;)V ARG 1 dependencyConsumer METHOD m_uxeswulh build (Lnet/minecraft/unmapped/C_rfhbnify$C_vjdvrntl;Ljava/util/function/Consumer;)Z + COMMENT @return {@code false} if this entry is {@link #required} and missing elements, + COMMENT or {@code true} otherwise ARG 1 lookup ARG 2 entryConsumer METHOD m_vcjbnogv (Lnet/minecraft/unmapped/C_tyjpezxh$C_pdblrsjv;)Lnet/minecraft/unmapped/C_rfhbnify; diff --git a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping index 861f6a4760..82da2fc5f6 100644 --- a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping @@ -5,19 +5,54 @@ CLASS net/minecraft/unmapped/C_loluvnda net/minecraft/registry/tag/TagGroupLoade METHOD (Ljava/util/function/Function;Ljava/lang/String;)V ARG 1 registryGetter ARG 2 dataType + METHOD m_bkqhferu startReload (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_wqxmvzdq;)Ljava/util/List; + METHOD m_cnrhcfvg (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_ednuhnnn; + ARG 1 entry + METHOD m_ikawpeov findTagsForRegistry (Ljava/util/List;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_tqxyjqsk$C_dbbudibo; + ARG 0 pendingTags + ARG 1 registry + METHOD m_kyffttrm (Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V + ARG 3 entries + METHOD m_lxlpnfxr build (Ljava/util/Map;)Ljava/util/Map; + ARG 1 tagEntriesById METHOD m_lyfwhzmo (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/util/List; ARG 0 id + METHOD m_mvakemgw (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)Ljava/util/Optional; + ARG 1 registry + METHOD m_ntzdmsxk bind (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_eexxncvi;)V + METHOD m_pdezujhk bindPayloadTags (Lnet/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl;Lnet/minecraft/unmapped/C_eexxncvi;)V + METHOD m_pohiyfij (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V + ARG 1 entries + METHOD m_pqihicpm mapTagsByKey (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/Map;)Ljava/util/Map; + ARG 0 registry + ARG 1 tagValuesById METHOD m_pxvzrgnx (Lnet/minecraft/unmapped/C_vnjbukpx;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V ARG 1 tagId + ARG 2 entries + METHOD m_qzspoexh collectLookups (Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;Ljava/util/List;)Ljava/util/List; + ARG 0 frozenManager + ARG 1 pendingTags + METHOD m_sdvttiaz (Ljava/util/Map;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V ARG 2 values METHOD m_ugheewlx (Lnet/minecraft/unmapped/C_rfhbnify$C_vjdvrntl;Ljava/util/Map;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_loluvnda$C_kgkcribd;)V ARG 3 dependencyId ARG 4 entry + METHOD m_vmlqwtwd tryBuildTag (Lnet/minecraft/unmapped/C_rfhbnify$C_vjdvrntl;Ljava/util/List;)Lcom/mojang/datafixers/util/Either; + ARG 1 lookup + ARG 2 entries + METHOD m_wzqzziti startReload (Lnet/minecraft/unmapped/C_tmnrpasf;Lnet/minecraft/unmapped/C_tqxyjqsk;)Ljava/util/Optional; + METHOD m_xplypekk (Ljava/util/List;Ljava/lang/String;Lnet/minecraft/unmapped/C_rfhbnify;)V + ARG 2 entry METHOD m_zgfhlzfp loadTags (Lnet/minecraft/unmapped/C_tmnrpasf;)Ljava/util/Map; ARG 1 manager + METHOD m_ztwvksdw (Ljava/util/List;Ljava/util/List;Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)V + ARG 2 registry CLASS C_csxylpni EntryWithSource CLASS C_kgkcribd SortingEntry METHOD m_dxolbnxx (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_loluvnda$C_csxylpni;)V ARG 1 entry METHOD m_qmabmdkt (Ljava/util/function/Consumer;Lnet/minecraft/unmapped/C_loluvnda$C_csxylpni;)V ARG 1 entry + CLASS C_shtfmyxy RegistryTags + FIELD f_nufuoyyj registry Lnet/minecraft/unmapped/C_xhhleach; + METHOD m_njnnimus registry ()Lnet/minecraft/unmapped/C_xhhleach; diff --git a/mappings/net/minecraft/registry/tag/TagKey.mapping b/mappings/net/minecraft/registry/tag/TagKey.mapping index 8694470f9a..deead97db2 100644 --- a/mappings/net/minecraft/registry/tag/TagKey.mapping +++ b/mappings/net/minecraft/registry/tag/TagKey.mapping @@ -1,29 +1,20 @@ CLASS net/minecraft/unmapped/C_ednuhnnn net/minecraft/registry/tag/TagKey COMMENT Represents the key to a tag. FIELD f_fngkjvvp INTERNER Lcom/google/common/collect/Interner; - FIELD f_rhygxpit registry Lnet/minecraft/unmapped/C_xhhleach; FIELD f_wbefqdhh id Lnet/minecraft/unmapped/C_ncpywfca; - METHOD (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)V - ARG 1 registry - ARG 2 id METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD m_ahscublx registry ()Lnet/minecraft/unmapped/C_xhhleach; - COMMENT {@return the registry of the tag} - METHOD m_cnhddcoq (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ednuhnnn; - ARG 1 id + METHOD m_amzyqent createPacketCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu; + ARG 0 registry METHOD m_cpofnwfv cast (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; - ARG 1 registry METHOD m_dfjqzijw createHashedCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/Codec; ARG 0 registry - METHOD m_falsrzjj (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ednuhnnn; - ARG 1 id METHOD m_fhvidlta of (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ednuhnnn; - ARG 0 registry - ARG 1 id METHOD m_kdwcbfsq createCodec (Lnet/minecraft/unmapped/C_xhhleach;)Lcom/mojang/serialization/Codec; ARG 0 registry METHOD m_nimfilyc id ()Lnet/minecraft/unmapped/C_ncpywfca; - COMMENT {@return the identifier of the tag} + METHOD m_ojeiekxj (Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 1 tagId METHOD m_shpovedp isOfRegistry (Lnet/minecraft/unmapped/C_xhhleach;)Z ARG 1 registry diff --git a/mappings/net/minecraft/registry/tag/TagNetworkSerialization.mapping b/mappings/net/minecraft/registry/tag/TagNetworkSerialization.mapping index d7836e6770..5994944311 100644 --- a/mappings/net/minecraft/registry/tag/TagNetworkSerialization.mapping +++ b/mappings/net/minecraft/registry/tag/TagNetworkSerialization.mapping @@ -7,12 +7,17 @@ CLASS net/minecraft/unmapped/C_mnjlaveb net/minecraft/registry/tag/TagNetworkSer METHOD m_rbaywqeb (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/util/Map;Lnet/minecraft/unmapped/C_ncpywfca;Lit/unimi/dsi/fastutil/ints/IntList;)V ARG 3 rawKey ARG 4 rawIds + METHOD m_wlbzetjq (Lnet/minecraft/unmapped/C_tqxyjqsk;Ljava/util/Map;Lnet/minecraft/unmapped/C_odfnijdo$C_orinjhqu;)V + ARG 2 tag METHOD m_woeawqvz (Lnet/minecraft/unmapped/C_wqxmvzdq$C_rsrqqoeq;)Lcom/mojang/datafixers/util/Pair; ARG 0 entry CLASS C_mlxyrlwl NetworkPayload + FIELD f_ugaeqeld EMPTY Lnet/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl; FIELD f_vveyuvdt tags Ljava/util/Map; METHOD (Ljava/util/Map;)V ARG 1 tags + METHOD m_dvimurkf deserialize (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_loluvnda$C_shtfmyxy; + METHOD m_eeesjtic isEmpty ()Z METHOD m_rkwmkzdp write (Lnet/minecraft/unmapped/C_idfydwco;)V METHOD m_rusalxco read (Lnet/minecraft/unmapped/C_idfydwco;)Lnet/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl; ARG 0 packet diff --git a/mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping b/mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping index 6a929cda00..33cf783e59 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardDisplaySlot.mapping @@ -5,4 +5,4 @@ CLASS net/minecraft/unmapped/C_oakvluoh net/minecraft/scoreboard/ScoreboardDispl FIELD f_zzsgiezz CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; METHOD m_kbezgswv fromFormatting (Lnet/minecraft/unmapped/C_tnezalvh;)Lnet/minecraft/unmapped/C_oakvluoh; ARG 0 formatting - METHOD m_tfrlknfr id ()I + METHOD m_tfrlknfr getId ()I diff --git a/mappings/net/minecraft/server/command/LootCommand.mapping b/mappings/net/minecraft/server/command/LootCommand.mapping index fe158856d8..bc2a61d468 100644 --- a/mappings/net/minecraft/server/command/LootCommand.mapping +++ b/mappings/net/minecraft/server/command/LootCommand.mapping @@ -56,6 +56,8 @@ CLASS net/minecraft/unmapped/C_bqrskrfs net/minecraft/server/command/LootCommand ARG 0 context ARG 1 stacks ARG 2 messageSender + METHOD m_lqhmryxk (Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/List;Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 2 lootTable METHOD m_lqzcrgsp executeFish (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_bqrskrfs$C_jsqppuqn;)I ARG 0 context ARG 2 pos diff --git a/mappings/net/minecraft/server/function/FunctionGetter.mapping b/mappings/net/minecraft/server/function/FunctionGetter.mapping new file mode 100644 index 0000000000..90f7cc89a0 --- /dev/null +++ b/mappings/net/minecraft/server/function/FunctionGetter.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/unmapped/C_uxzryfxv net/minecraft/server/function/FunctionGetter + FIELD f_cxzaybvc commandFunctionSet Z + FIELD f_kkregdwp commandFunction Ljava/util/Optional; + METHOD m_ashjquub getId ()Lnet/minecraft/unmapped/C_ncpywfca; + METHOD m_ecdplsxc get (Lnet/minecraft/unmapped/C_nbwcoknw;)Ljava/util/Optional; + ARG 1 manager diff --git a/mappings/net/minecraft/server/function/FunctionLoader.mapping b/mappings/net/minecraft/server/function/FunctionLoader.mapping index 1c00a94335..2ab506704c 100644 --- a/mappings/net/minecraft/server/function/FunctionLoader.mapping +++ b/mappings/net/minecraft/server/function/FunctionLoader.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/unmapped/C_coevuhwv net/minecraft/server/function/FunctionLo COMMENT COMMENT @see CommandFunctionManager FIELD f_anihhgdl commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; + FIELD f_bfnxpout FUNCTION_REGISTRY_KEY Lnet/minecraft/unmapped/C_xhhleach; FIELD f_dwlynspj tagLoader Lnet/minecraft/unmapped/C_loluvnda; FIELD f_gvdhfneh level I FIELD f_jqaopjny functions Ljava/util/Map; diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index c537e414ab..89926e8c41 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -33,6 +33,7 @@ CLASS net/minecraft/unmapped/C_bdwnwhiu net/minecraft/server/world/ServerWorld FIELD f_zwskxqrh inBlockTick Z METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lnet/minecraft/unmapped/C_gjwbvqct;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_alziuayn;Lnet/minecraft/unmapped/C_jnfclwgd;ZJLjava/util/List;ZLnet/minecraft/unmapped/C_xmjhbbku;)V ARG 3 session + ARG 5 key ARG 6 dimensionOptions ARG 7 worldgenProgressListener ARG 13 randomSequences diff --git a/mappings/net/minecraft/structure/TrailRuinsGenerator.mapping b/mappings/net/minecraft/structure/TrailRuinsGenerator.mapping index ce04e96a2d..3d4bb5434c 100644 --- a/mappings/net/minecraft/structure/TrailRuinsGenerator.mapping +++ b/mappings/net/minecraft/structure/TrailRuinsGenerator.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/unmapped/C_trcxslji net/minecraft/structure/TrailRuinsGenerator + FIELD f_ublygabq REGISTRY_KEY Lnet/minecraft/unmapped/C_xhhleach; METHOD m_loejapwq bootstrap (Lnet/minecraft/unmapped/C_hqoyyfco;)V ARG 0 pool diff --git a/mappings/net/minecraft/structure/piece/StructurePiece.mapping b/mappings/net/minecraft/structure/piece/StructurePiece.mapping index b4f3435fe9..d4018161e7 100644 --- a/mappings/net/minecraft/structure/piece/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/piece/StructurePiece.mapping @@ -62,6 +62,8 @@ CLASS net/minecraft/unmapped/C_coopoqiy net/minecraft/structure/piece/StructureP ARG 6 box METHOD m_iacbleeq (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V ARG 1 nbt + METHOD m_imiulckt (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_hmqypqzz;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_txtbiemp;)Z + ARG 5 lootTable METHOD m_ipyahbus getEncompassingBoundingBox (Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_hmqypqzz; ARG 0 pieceStream METHOD m_jyctiurm getCenter ()Lnet/minecraft/unmapped/C_hynzadkk; @@ -131,6 +133,8 @@ CLASS net/minecraft/unmapped/C_coopoqiy net/minecraft/structure/piece/StructureP ARG 7 z ARG 8 state METHOD m_orkybnyc getMirror ()Lnet/minecraft/unmapped/C_qomzaqud; + METHOD m_osxlnmji (Lnet/minecraft/unmapped/C_ldkphtbr;Lnet/minecraft/unmapped/C_hmqypqzz;Lnet/minecraft/unmapped/C_rlomrsco;IIILnet/minecraft/unmapped/C_xhhleach;)Z + ARG 7 lootTable METHOD m_ovlrimpa writeNbt (Lnet/minecraft/unmapped/C_ywyzxrzo;Lnet/minecraft/unmapped/C_hhlwcnih;)V ARG 1 context ARG 2 nbt diff --git a/mappings/net/minecraft/structure/pool/alias/StructurePoolAliasLookup.mapping b/mappings/net/minecraft/structure/pool/alias/StructurePoolAliasLookup.mapping index 64e26ecc98..e44c4085c6 100644 --- a/mappings/net/minecraft/structure/pool/alias/StructurePoolAliasLookup.mapping +++ b/mappings/net/minecraft/structure/pool/alias/StructurePoolAliasLookup.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/unmapped/C_klopvdsw net/minecraft/structure/pool/alias/StructurePoolAliasLookup + FIELD f_ycsrssgx IDENTITY Lnet/minecraft/unmapped/C_klopvdsw; METHOD create (Ljava/util/List;Lnet/minecraft/unmapped/C_hynzadkk;J)Lnet/minecraft/unmapped/C_klopvdsw; ARG 0 aliasBindings ARG 2 seed + METHOD lookup (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 1 pool + METHOD m_dthelvjs (Ljava/util/Map;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 1 pool + METHOD m_gfsjshyj (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_xhhleach; + ARG 0 pool METHOD m_mzvvxeov (Lnet/minecraft/unmapped/C_rlomrsco;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/unmapped/C_xsycfxyj;)V ARG 2 binding diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index 449069906d..4cbcd8d41e 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -147,6 +147,7 @@ CLASS net/minecraft/unmapped/C_ncfucati net/minecraft/test/TestContext ARG 3 propertyName ARG 4 expectedValue METHOD m_mfctcsuu setBiome (Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 biome METHOD m_mfjsfrfk expectNoEntityAt (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 testedType ARG 2 pos diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 30fa9f8498..a1f31ba34c 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -7,14 +7,9 @@ CLASS net/minecraft/unmapped/C_arllgqae net/minecraft/util/DyeColor FIELD f_meofdgkv opaqueColor I FIELD f_nawrgolb name Ljava/lang/String; FIELD f_xhygajpx CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; - FIELD f_zvugkomq VALUES Ljava/util/function/IntFunction; + FIELD f_zvugkomq BY_ID Ljava/util/function/IntFunction; METHOD (Ljava/lang/String;IILjava/lang/String;ILnet/minecraft/unmapped/C_mlrprqox;II)V - ARG 3 id - ARG 4 name ARG 5 color - ARG 6 mapColor - ARG 7 fireworkColor - ARG 8 signColor METHOD m_bmfhojjc getFireworkColor ()I METHOD m_jycwbrof (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_arllgqae; ARG 0 color diff --git a/mappings/net/minecraft/util/ErrorReporter.mapping b/mappings/net/minecraft/util/ErrorReporter.mapping index f3429204d4..c08e3458fc 100644 --- a/mappings/net/minecraft/util/ErrorReporter.mapping +++ b/mappings/net/minecraft/util/ErrorReporter.mapping @@ -3,12 +3,12 @@ CLASS net/minecraft/unmapped/C_jtpvewkp net/minecraft/util/ErrorReporter ARG 1 name METHOD m_qtdgardw report (Ljava/lang/String;)V ARG 1 message - CLASS C_jbcmnrpq Impl - FIELD f_bbfpemek errors Lcom/google/common/collect/Multimap; + CLASS C_jbcmnrpq Collector + FIELD f_bbfpemek errorsByPath Lcom/google/common/collect/Multimap; FIELD f_vksywrdq pathSupplier Ljava/util/function/Supplier; FIELD f_vnjffosi pathCache Ljava/lang/String; METHOD m_efsyoiry (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 0 error - METHOD m_fdjwfdmg copyErrors ()Lcom/google/common/collect/Multimap; + METHOD m_fdjwfdmg copyErrorsByPath ()Lcom/google/common/collect/Multimap; METHOD m_oscjmxcu getPath ()Ljava/lang/String; - METHOD m_pznzwrnj getErrors ()Ljava/util/Optional; + METHOD m_pznzwrnj getFormattedErrors ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/util/Rarity.mapping b/mappings/net/minecraft/util/Rarity.mapping index 700a3adb10..b9024efe7f 100644 --- a/mappings/net/minecraft/util/Rarity.mapping +++ b/mappings/net/minecraft/util/Rarity.mapping @@ -1,2 +1,10 @@ CLASS net/minecraft/unmapped/C_mqmixksm net/minecraft/util/Rarity + FIELD f_dobvxewt BY_ID Ljava/util/function/IntFunction; FIELD f_efjldeaw formatting Lnet/minecraft/unmapped/C_tnezalvh; + FIELD f_gahweovi name Ljava/lang/String; + FIELD f_vjzoaznr id I + METHOD m_afthohlj (Lnet/minecraft/unmapped/C_mqmixksm;)I + ARG 0 rarity + METHOD m_waqdxpfx getFormatting ()Lnet/minecraft/unmapped/C_tnezalvh; + METHOD m_ygjlgyki (Lnet/minecraft/unmapped/C_mqmixksm;)I + ARG 0 rarity diff --git a/mappings/net/minecraft/util/ServerLinks.mapping b/mappings/net/minecraft/util/ServerLinks.mapping index d9e792e52b..6054b74e43 100644 --- a/mappings/net/minecraft/util/ServerLinks.mapping +++ b/mappings/net/minecraft/util/ServerLinks.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/unmapped/C_ouodvkzu net/minecraft/util/ServerLinks FIELD f_bzzdfgiz ANNOUNCEMENTS Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb; FIELD f_jgahizwy NEWS Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb; FIELD f_joplxvpt name Ljava/lang/String; - FIELD f_mthepcno TYPE_BY_ID Ljava/util/function/IntFunction; + FIELD f_mthepcno BY_ID Ljava/util/function/IntFunction; FIELD f_njpehptj WEBSITE Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb; FIELD f_odpaxfmq id I FIELD f_ogdsfwkm COMMUNITY Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb; @@ -31,9 +31,6 @@ CLASS net/minecraft/unmapped/C_ouodvkzu net/minecraft/util/ServerLinks FIELD f_sryfhkth PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_wjtzsflv COMMUNITY_GUIDELINES Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb; FIELD f_ygigecmi STATUS Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name METHOD m_exisudua (Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb;)I ARG 0 type METHOD m_fhdosdck toText ()Lnet/minecraft/unmapped/C_rdaqiwdt; @@ -44,17 +41,17 @@ CLASS net/minecraft/unmapped/C_ouodvkzu net/minecraft/util/ServerLinks CLASS C_moygobps UriEntry FIELD f_qktbynhi uri Ljava/net/URI; FIELD f_zocyfbhf type Lcom/mojang/datafixers/util/Either; - METHOD m_blmwnrwf create (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/net/URI;)Lnet/minecraft/unmapped/C_ouodvkzu$C_moygobps; + METHOD m_blmwnrwf of (Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/net/URI;)Lnet/minecraft/unmapped/C_ouodvkzu$C_moygobps; ARG 0 text ARG 1 uri METHOD m_ffdftzwi (Lnet/minecraft/unmapped/C_rdaqiwdt;)Lnet/minecraft/unmapped/C_rdaqiwdt; ARG 0 text METHOD m_iloazxnb type ()Lcom/mojang/datafixers/util/Either; METHOD m_jnarqxxi asText ()Lnet/minecraft/unmapped/C_rdaqiwdt; - METHOD m_mwenanpk create (Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb;Ljava/net/URI;)Lnet/minecraft/unmapped/C_ouodvkzu$C_moygobps; + METHOD m_mwenanpk of (Lnet/minecraft/unmapped/C_ouodvkzu$C_ekdhaajb;Ljava/net/URI;)Lnet/minecraft/unmapped/C_ouodvkzu$C_moygobps; ARG 0 type ARG 1 link - METHOD m_pvnqioxl link ()Ljava/net/URI; + METHOD m_pvnqioxl uri ()Ljava/net/URI; CLASS C_tkgsynzm StringEntry FIELD f_bkyrcubk type Lcom/mojang/datafixers/util/Either; FIELD f_fsoqsjje link Ljava/lang/String; diff --git a/mappings/net/minecraft/util/collection/IdListUtil.mapping b/mappings/net/minecraft/util/collection/IdListUtil.mapping index e9a9a4c449..3bc0d226af 100644 --- a/mappings/net/minecraft/util/collection/IdListUtil.mapping +++ b/mappings/net/minecraft/util/collection/IdListUtil.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/unmapped/C_dhqzpyzp net/minecraft/util/collection/IdListUtil - METHOD m_meoxyrpm sortArray (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Lnet/minecraft/unmapped/C_dhqzpyzp$C_efznwcig;)Ljava/util/function/IntFunction; - ARG 0 toIdFunction + METHOD m_eprjpkup ([Ljava/lang/Object;II)Ljava/lang/Object; + ARG 2 id + METHOD m_meoxyrpm createByIdGetter (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Lnet/minecraft/unmapped/C_dhqzpyzp$C_efznwcig;)Ljava/util/function/IntFunction; + ARG 0 idGetter ARG 1 values ARG 2 outOfBoundsHandler METHOD m_oipnvilm idToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/function/IntFunction; @@ -10,9 +12,13 @@ CLASS net/minecraft/unmapped/C_dhqzpyzp net/minecraft/util/collection/IdListUtil METHOD m_olzakdxv idToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;)Ljava/util/function/IntFunction; ARG 0 toIdFunction ARG 1 values - METHOD m_sjrgdfrp sortArray (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;)[Ljava/lang/Object; - ARG 0 toIdFunction + METHOD m_qynupghu ([Ljava/lang/Object;II)Ljava/lang/Object; + ARG 2 id + METHOD m_sjrgdfrp copySorted (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;)[Ljava/lang/Object; + ARG 0 idGetter ARG 1 values METHOD m_ukanoarc (Ljava/util/function/IntFunction;Ljava/lang/Object;I)Ljava/lang/Object; ARG 2 object + METHOD m_ymrsokdu (I[Ljava/lang/Object;Ljava/lang/Object;I)Ljava/lang/Object; + ARG 3 id CLASS C_efznwcig OutOfBoundsHandler diff --git a/mappings/net/minecraft/util/collection/IndexedIterable.mapping b/mappings/net/minecraft/util/collection/IndexedIterable.mapping index 1de9568af0..63ad0fd030 100644 --- a/mappings/net/minecraft/util/collection/IndexedIterable.mapping +++ b/mappings/net/minecraft/util/collection/IndexedIterable.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/unmapped/C_feaetnaz net/minecraft/util/collection/IndexedIte FIELD f_iecnjcxw DEFAULT I METHOD m_hjasljfw getRawIdOrThrow (Ljava/lang/Object;)I METHOD m_jmjsmdoh get (I)Ljava/lang/Object; - ARG 1 index + ARG 1 rawId METHOD m_lwumvtoo getOrThrow (I)Ljava/lang/Object; COMMENT {@return the value at {@code index}} COMMENT diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 7edc742d41..6ecc6f1a5b 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -52,7 +52,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs ARG 1 elementCodec METHOD m_ifdvuwzy formattedTime (Ljava/time/format/DateTimeFormatter;)Lcom/mojang/serialization/Codec; ARG 0 formatter - METHOD m_ihvqsgya retrieveContext (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; + METHOD m_ihvqsgya createContextRetrievalCodec (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; ARG 0 retriever METHOD m_ilnvpqgy optionalEmptyMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; METHOD m_juozehmq withNonEmptyHolderSet (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 58d35ab229..b0738611db 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -3,23 +3,17 @@ CLASS net/minecraft/unmapped/C_xpuuihxf net/minecraft/util/math/Direction FIELD f_aeejwnnb VERTICAL_CODEC Lcom/mojang/serialization/Codec; FIELD f_bqmoexgm HORIZONTAL [Lnet/minecraft/unmapped/C_xpuuihxf; FIELD f_cbbzbcev axis Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz; - FIELD f_jqokexui idOpposite I - FIELD f_midvwggr VALUES [Lnet/minecraft/unmapped/C_xpuuihxf; + FIELD f_fudaavft BY_ID Ljava/util/function/IntFunction; + FIELD f_jqokexui oppositeId I + FIELD f_midvwggr ALL_SORTED [Lnet/minecraft/unmapped/C_xpuuihxf; FIELD f_nxrqizwh PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu; FIELD f_qmkvdeuo direction Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq; - FIELD f_wytgjiez idHorizontal I + FIELD f_suuqwjwk vec3d Lnet/minecraft/unmapped/C_vgpupfxx; + FIELD f_wytgjiez horizontalId I FIELD f_xneestkm ALL [Lnet/minecraft/unmapped/C_xpuuihxf; FIELD f_xnopevsr id I - FIELD f_yxdvzmgt vector Lnet/minecraft/unmapped/C_ceivtqhh; + FIELD f_yxdvzmgt vec3i Lnet/minecraft/unmapped/C_ceivtqhh; FIELD f_zbhygcbw CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; - METHOD (Ljava/lang/String;IIIILjava/lang/String;Lnet/minecraft/unmapped/C_xpuuihxf$C_ozjqcgqq;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_ceivtqhh;)V - ARG 3 id - ARG 4 idOpposite - ARG 5 idHorizontal - ARG 6 name - ARG 7 direction - ARG 8 axis - ARG 9 vector METHOD m_arokrhof validateVertical (Lnet/minecraft/unmapped/C_xpuuihxf;)Lcom/mojang/serialization/DataResult; ARG 0 direction METHOD m_atdyqmtg getId ()I diff --git a/mappings/net/minecraft/village/TradeOffer.mapping b/mappings/net/minecraft/village/TradeOffer.mapping index 5bbe425d6f..7b67887488 100644 --- a/mappings/net/minecraft/village/TradeOffer.mapping +++ b/mappings/net/minecraft/village/TradeOffer.mapping @@ -12,6 +12,10 @@ CLASS net/minecraft/unmapped/C_argwryfu net/minecraft/village/TradeOffer FIELD f_vcpzwcnv rewardingPlayerExperience Z METHOD (Lnet/minecraft/unmapped/C_argwryfu;)V ARG 1 offer + METHOD (Lnet/minecraft/unmapped/C_gqfxurno;Ljava/util/Optional;Lnet/minecraft/unmapped/C_sddaxwyk;IIZIIFI)V + ARG 3 sellItem + METHOD (Lnet/minecraft/unmapped/C_gqfxurno;Lnet/minecraft/unmapped/C_sddaxwyk;IIF)V + ARG 2 sellItem METHOD m_akycaqxo getMerchantExperience ()I COMMENT Returns the amount of experience that will be given to a merchant COMMENT after this trade offer has been used. diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index b1f7f9e9f7..b193e6b38c 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -24,6 +24,8 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers FIELD f_xkddlaga RARE_MAX_USES I FIELD f_yxdcxrtp EXPERT_SELL_XP I FIELD f_zeisnuhl JOURNEYMAN_BUY_XP I + METHOD m_bfpxnwru (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp;)Lnet/minecraft/unmapped/C_naseleda$C_qvundqhp; + ARG 1 predicate METHOD m_bikzaaar toTradeableItem (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_gqfxurno; ARG 0 potion METHOD m_makateev copyToFastUtilMap (Lcom/google/common/collect/ImmutableMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; @@ -80,38 +82,42 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers ARG 4 experience ARG 5 priceMultiplier CLASS C_lrpwofjn ProcessItemFactory + FIELD f_ejmritbz enchantmentProvider Ljava/util/Optional; FIELD f_fjgkvjkd maxUses I - FIELD f_kdtzftpi sell Lnet/minecraft/unmapped/C_sddaxwyk; + FIELD f_kdtzftpi processedItem Lnet/minecraft/unmapped/C_sddaxwyk; FIELD f_tgtrersi experience I FIELD f_tzmnlyxu priceMultiplier F FIELD f_vrezjoqy price I - FIELD f_xriqnzpf secondBuy Lnet/minecraft/unmapped/C_gqfxurno; + FIELD f_xriqnzpf unprocessedItem Lnet/minecraft/unmapped/C_gqfxurno; + METHOD (Lnet/minecraft/unmapped/C_gmbqjnle;IILnet/minecraft/unmapped/C_gmbqjnle;IIIFLnet/minecraft/unmapped/C_xhhleach;)V + ARG 1 unprocessedItem + ARG 2 unprocessedCount + ARG 4 processedItem + ARG 5 processedCount + ARG 9 enchantmentProvider METHOD (Lnet/minecraft/unmapped/C_gmbqjnle;IILnet/minecraft/unmapped/C_sddaxwyk;IIIF)V - ARG 1 item - ARG 2 count - ARG 3 price + ARG 1 unprocessedItem + ARG 2 unprocessedCount ARG 4 processedItem - ARG 5 processedItemCount - ARG 6 maxUses - ARG 7 experience - ARG 8 priceMultiplier + ARG 5 processedCount METHOD (Lnet/minecraft/unmapped/C_gmbqjnle;IILnet/minecraft/unmapped/C_vorddnax;IIIF)V - ARG 1 item - ARG 2 count - ARG 3 price + ARG 1 unprocessedItem + ARG 2 unprocessedCount ARG 4 processedItem - ARG 5 processedItemCount - ARG 6 maxUses - ARG 7 experience - ARG 8 priceMultiplier + ARG 5 processedCount + METHOD (Lnet/minecraft/unmapped/C_gqfxurno;ILnet/minecraft/unmapped/C_sddaxwyk;IIFLjava/util/Optional;)V + ARG 1 unprocessedItem + ARG 3 processedItem CLASS C_mhysqpkt EmptyFactory CLASS C_oigljzdw EnchantBookFactory FIELD f_ergftuze minLevel I FIELD f_ewyrltat maxLevel I + FIELD f_fykexdki enchantmentPool Lnet/minecraft/unmapped/C_ednuhnnn; FIELD f_jzuznifm experience I CLASS C_qgveffhr BuyForOneEmeraldFactory FIELD f_eyddoaua experience I FIELD f_kricdfec price I + FIELD f_mghsbwuc buyItem Lnet/minecraft/unmapped/C_gqfxurno; FIELD f_tkfkyzcv priceMultiplier F FIELD f_uzbukszc maxUses I METHOD (Lnet/minecraft/unmapped/C_gmbqjnle;III)V @@ -152,6 +158,7 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers CLASS C_sgimohkx SellItemFactory FIELD f_cyskhcmw maxUses I FIELD f_etwwexea sell Lnet/minecraft/unmapped/C_sddaxwyk; + FIELD f_jsxjznwq enchantmentProvider Ljava/util/Optional; FIELD f_mvgznpla priceMultiplier F FIELD f_ouofvtss price I FIELD f_vvhouvvg experience I @@ -192,6 +199,8 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers ARG 4 maxUses ARG 5 experience ARG 6 priceMultiplier + METHOD (Lnet/minecraft/unmapped/C_vorddnax;IIIIFLnet/minecraft/unmapped/C_xhhleach;)V + ARG 7 enchantmentProvider CLASS C_vlyzlpkn SellMapFactory FIELD f_aapijarc mapName Ljava/lang/String; FIELD f_gatuwlra price I @@ -200,9 +209,13 @@ CLASS net/minecraft/unmapped/C_hqrlptsj net/minecraft/village/TradeOffers FIELD f_ushcytlj iconType Lnet/minecraft/unmapped/C_cjzoxshv; FIELD f_vwiqlfbj experience I CLASS C_vphnlyjn VillagerTypeSpecificFactory + METHOD m_flynwtfn (Lnet/minecraft/unmapped/C_vhpfztda;)Lnet/minecraft/unmapped/C_vhpfztda; + ARG 0 type METHOD m_ggpbncsc createTradeForBiomes (Lnet/minecraft/unmapped/C_hqrlptsj$C_bcdfyrkn;[Lnet/minecraft/unmapped/C_vhpfztda;)Lnet/minecraft/unmapped/C_hqrlptsj$C_vphnlyjn; ARG 0 factory ARG 1 villagerTypes + METHOD m_ygcvknbv (Lnet/minecraft/unmapped/C_hqrlptsj$C_bcdfyrkn;Lnet/minecraft/unmapped/C_vhpfztda;)Lnet/minecraft/unmapped/C_hqrlptsj$C_bcdfyrkn; + ARG 1 unused CLASS C_wututmqp TypeAwareBuyForOneEmeraldFactory FIELD f_leqjftkp maxUses I FIELD f_pxdyebdl count I diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index ee9dac2782..5ed2535247 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -13,7 +13,9 @@ CLASS net/minecraft/unmapped/C_szefbyex net/minecraft/village/raid/Raid FIELD f_fmgwzkdu POST_RAID_TICK_LIMIT I FIELD f_fnxkdmas DEFEAT_TITLE Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_gknmsuhn SPAWN_ATTEMPTS I + FIELD f_ieyxqzve VALID_RAID_RADIUS I FIELD f_jakhyora MAX_ACTIVE_TICKS I + FIELD f_jbrszwhw RAVAGER_SPAWN_RESTRICTION Lnet/minecraft/unmapped/C_zojcplzh; FIELD f_kdhitzkh RAID_REMOVE_THRESHOLD_SQUARED I FIELD f_kujahjos started Z FIELD f_kyzgcvgr random Lnet/minecraft/unmapped/C_rlomrsco; @@ -23,6 +25,7 @@ CLASS net/minecraft/unmapped/C_szefbyex net/minecraft/village/raid/Raid FIELD f_ngzvyrzk RAID_TIMEOUT_TICKS I FIELD f_okfqfabw waveToCaptain Ljava/util/Map; FIELD f_oxeijusq center Lnet/minecraft/unmapped/C_hynzadkk; + FIELD f_paujqkzq RAVAGER_SPAWNING_ALLOWED_SECONDS I FIELD f_qqdyznei status Lnet/minecraft/unmapped/C_szefbyex$C_ralvfjqe; FIELD f_rnqazgdq postRaidTicks I FIELD f_rvzgnmzd id I @@ -100,6 +103,7 @@ CLASS net/minecraft/unmapped/C_szefbyex net/minecraft/village/raid/Raid ARG 1 nbt METHOD m_pajuwpzg setCenter (Lnet/minecraft/unmapped/C_hynzadkk;)V ARG 1 center + METHOD m_pbwmgtdj createOminousBanner (Lnet/minecraft/unmapped/C_pzdchrcy;)Lnet/minecraft/unmapped/C_sddaxwyk; METHOD m_pcjjizjn getGroupsSpawned ()I METHOD m_prgonsry addRaider (ILnet/minecraft/unmapped/C_iaguvmwh;Lnet/minecraft/unmapped/C_hynzadkk;Z)V ARG 1 wave @@ -131,6 +135,8 @@ CLASS net/minecraft/unmapped/C_szefbyex net/minecraft/village/raid/Raid METHOD m_zmfpxjlb hasStopped ()Z METHOD m_zpxnmupw canSpawnRaiders ()Z METHOD m_zrbdaqtr getCurrentRaiderHealth ()F + METHOD m_zvijvbmu (Ljava/lang/Integer;)Ljava/util/Set; + ARG 0 unused CLASS C_mgsrpgzv Member FIELD f_ifqeyiev type Lnet/minecraft/unmapped/C_ogavsvbr; FIELD f_ijkzlfau VALUES [Lnet/minecraft/unmapped/C_szefbyex$C_mgsrpgzv; diff --git a/mappings/net/minecraft/world/Difficulty.mapping b/mappings/net/minecraft/world/Difficulty.mapping index ac1676d332..f615fbb518 100644 --- a/mappings/net/minecraft/world/Difficulty.mapping +++ b/mappings/net/minecraft/world/Difficulty.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/unmapped/C_mpbjgxic net/minecraft/world/Difficulty FIELD f_byewhmzg CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; FIELD f_kewzwuek id I - FIELD f_knikxerl BY_NAME Ljava/util/function/IntFunction; + FIELD f_knikxerl BY_ID Ljava/util/function/IntFunction; FIELD f_nbtqhzsu name Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id @@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_mpbjgxic net/minecraft/world/Difficulty METHOD m_cfjonvbd getInfoText ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_jfnrdhku byName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_mpbjgxic; ARG 0 name - METHOD m_lphvflky byOrdinal (I)Lnet/minecraft/unmapped/C_mpbjgxic; - ARG 0 ordinal + METHOD m_lphvflky byId (I)Lnet/minecraft/unmapped/C_mpbjgxic; + ARG 0 id METHOD m_obxmdevi getName ()Ljava/lang/String; METHOD m_vlsovuyi getId ()I diff --git a/mappings/net/minecraft/world/GameMode.mapping b/mappings/net/minecraft/world/GameMode.mapping index 953ec2fd4f..0c79f9d9d3 100644 --- a/mappings/net/minecraft/world/GameMode.mapping +++ b/mappings/net/minecraft/world/GameMode.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/unmapped/C_lghcpyvl net/minecraft/world/GameMode FIELD f_awdukclj DEFAULT Lnet/minecraft/unmapped/C_lghcpyvl; FIELD f_cifkkwzi id I - FIELD f_fofiipec TO_ID_FUNCTION Ljava/util/function/IntFunction; + FIELD f_fofiipec BY_ID Ljava/util/function/IntFunction; FIELD f_fovaffel translatableName Lnet/minecraft/unmapped/C_rdaqiwdt; FIELD f_jcxdddpi name Ljava/lang/String; FIELD f_lewmbrwu NULL_GAME_MODE_ID I FIELD f_nzmwalvo CODEC Lnet/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc; FIELD f_zotouesg simpleTranslatableName Lnet/minecraft/unmapped/C_rdaqiwdt; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name METHOD m_hlwoepvs isSurvivalLike ()Z METHOD m_lkyfhjye getSimpleTranslatableName ()Lnet/minecraft/unmapped/C_rdaqiwdt; METHOD m_nxzcfhje byName (Ljava/lang/String;)Lnet/minecraft/unmapped/C_lghcpyvl; diff --git a/mappings/net/minecraft/world/TrialSpawnerLogic.mapping b/mappings/net/minecraft/world/TrialSpawnerLogic.mapping index efed92c48d..382b74a9c9 100644 --- a/mappings/net/minecraft/world/TrialSpawnerLogic.mapping +++ b/mappings/net/minecraft/world/TrialSpawnerLogic.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/unmapped/C_jelkcvqk net/minecraft/world/TrialSpawnerLogic METHOD m_eoussynw setState (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_mefvrcdp;)V ARG 2 state METHOD m_ggqvmzns ejectLoot (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;)V + ARG 3 lootTable METHOD m_gtgamtxz getState ()Lnet/minecraft/unmapped/C_mefvrcdp; METHOD m_hvfivtpr getCodec ()Lcom/mojang/serialization/Codec; METHOD m_hxfvrqzw getOminousConfig ()Lnet/minecraft/unmapped/C_pocjjnjk; diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index 5356e36a28..0c8cce2820 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -15,8 +15,6 @@ CLASS net/minecraft/unmapped/C_vdvbsyle net/minecraft/world/WorldAccess METHOD m_eudwfuph getProperties ()Lnet/minecraft/unmapped/C_vsicwqkk; METHOD m_fnlxbhsq getServer ()Lnet/minecraft/server/MinecraftServer; METHOD m_fpfswynf emitGameEvent (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cgkchrmc$C_cjhidzon;)V - ARG 1 event - ARG 3 context METHOD m_fzlaofnh emitGameEvent (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_cgkchrmc$C_cjhidzon;)V ARG 1 event ARG 2 emitterPos @@ -44,17 +42,12 @@ CLASS net/minecraft/unmapped/C_vdvbsyle net/minecraft/world/WorldAccess ARG 2 pos ARG 3 data METHOD m_pqprudsr emitGameEvent (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cgkchrmc$C_cjhidzon;)V - ARG 3 context + ARG 1 event METHOD m_tssnbger getLocalDifficulty (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jiailwzt; ARG 1 pos METHOD m_ujsksuer emitGameEvent (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_vgpupfxx;)V - ARG 1 entity - ARG 2 event - ARG 3 pos METHOD m_umfnetns getChunkManager ()Lnet/minecraft/unmapped/C_bubysyxg; METHOD m_wztckqdb emitGameEvent (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_hynzadkk;)V - ARG 1 entity - ARG 2 event METHOD m_yjkyqlyg updateNeighbors (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;)V ARG 1 pos ARG 2 block diff --git a/mappings/net/minecraft/world/biome/GenerationSettings.mapping b/mappings/net/minecraft/world/biome/GenerationSettings.mapping index a695ea4ff5..9594e2f8af 100644 --- a/mappings/net/minecraft/world/biome/GenerationSettings.mapping +++ b/mappings/net/minecraft/world/biome/GenerationSettings.mapping @@ -28,8 +28,10 @@ CLASS net/minecraft/unmapped/C_qbjpvmph net/minecraft/world/biome/GenerationSett ARG 1 features ARG 2 carvers METHOD m_jtwrhufd carver (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qbjpvmph$C_bwxzcdhs; + ARG 1 carver METHOD m_qhxraujc feature (Lnet/minecraft/unmapped/C_rdrmebyw$C_eibovkzt;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qbjpvmph$C_bwxzcdhs; ARG 1 featureStep + ARG 2 feature CLASS C_thdznmut PlainBuilder FIELD f_butdfpqn features Ljava/util/List; FIELD f_efnbqovo carvers Ljava/util/List; diff --git a/mappings/net/minecraft/world/biome/source/util/OverworldBiomeParameters.mapping b/mappings/net/minecraft/world/biome/source/util/OverworldBiomeParameters.mapping index 78753efd2a..1b166f555e 100644 --- a/mappings/net/minecraft/world/biome/source/util/OverworldBiomeParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/OverworldBiomeParameters.mapping @@ -47,6 +47,7 @@ CLASS net/minecraft/unmapped/C_onndvydg net/minecraft/world/biome/source/util/Ov ARG 5 erosion ARG 6 depth ARG 7 weirdness + ARG 8 biome METHOD m_cumhdlyb pickPeakBiome (IILnet/minecraft/unmapped/C_ohqwadgy$C_pmcopbbm;)Lnet/minecraft/unmapped/C_xhhleach; ARG 1 temperature ARG 2 humidity diff --git a/mappings/net/minecraft/world/dimension/WorldDimensions.mapping b/mappings/net/minecraft/world/dimension/WorldDimensions.mapping index 1fdfa11167..3bffc62909 100644 --- a/mappings/net/minecraft/world/dimension/WorldDimensions.mapping +++ b/mappings/net/minecraft/world/dimension/WorldDimensions.mapping @@ -19,13 +19,16 @@ CLASS net/minecraft/unmapped/C_oiwekzxo net/minecraft/world/dimension/WorldDimen METHOD m_mflvjtrh streamInOrder (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; ARG 0 dimensionStream METHOD m_ngyfnwyr getLifecycle (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_alziuayn;)Lcom/mojang/serialization/Lifecycle; + ARG 0 options ARG 1 dimension METHOD m_pkwubvhk isDebug ()Z METHOD m_pqnovmjd (Lnet/minecraft/unmapped/C_alziuayn;)Lnet/minecraft/unmapped/C_jmmczzpb$C_ooteyfin; ARG 0 dimension METHOD m_qrljwitr getWorldKeys ()Lcom/google/common/collect/ImmutableSet; METHOD m_skajvlst get (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional; + ARG 1 key METHOD m_udnciizs isVanilla (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_alziuayn;)Z + ARG 0 options ARG 1 dimension METHOD m_xiunuxre bake (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_oiwekzxo$C_djwmjrji; METHOD m_zzejycps (Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_oiwekzxo$C_ddnnhray;)V diff --git a/mappings/net/minecraft/world/event/vibration/VibrationManager.mapping b/mappings/net/minecraft/world/event/vibration/VibrationManager.mapping index 491b1cda92..1b410ac8a2 100644 --- a/mappings/net/minecraft/world/event/vibration/VibrationManager.mapping +++ b/mappings/net/minecraft/world/event/vibration/VibrationManager.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_ddxrijfx net/minecraft/world/event/vibration/Vibr FIELD f_chcearum RESONATION_EVENTS Ljava/util/List; FIELD f_gqgeadrg DEFAULT_VIBRATION_FREQUENCY I METHOD m_afqazgpz getFrequency (Lnet/minecraft/unmapped/C_xhhleach;)I + ARG 0 event METHOD m_bggysyds getResonationEvent (I)Lnet/minecraft/unmapped/C_xhhleach; ARG 0 frequency METHOD m_exbfavst getVibrationData ()Lnet/minecraft/unmapped/C_ddxrijfx$C_qhpiojal; diff --git a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping index e9bfa10ff4..69233f7797 100644 --- a/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/MineshaftFeature.mapping @@ -13,19 +13,18 @@ CLASS net/minecraft/unmapped/C_jdubdjcx net/minecraft/world/gen/feature/Mineshaf ARG 2 context CLASS C_apnarkxp Type FIELD f_acyrhkbn log Lnet/minecraft/unmapped/C_txtbiemp; - FIELD f_jpajgjwf FROM_ORDINAL Ljava/util/function/IntFunction; + FIELD f_jpajgjwf BY_ID Ljava/util/function/IntFunction; FIELD f_npykgrgv planks Lnet/minecraft/unmapped/C_txtbiemp; FIELD f_qmjpricc name Ljava/lang/String; FIELD f_rgbybqfo fence Lnet/minecraft/unmapped/C_txtbiemp; FIELD f_spilvvqc CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V - ARG 3 name - ARG 4 logBlock - ARG 5 planksBlock - ARG 6 fenceBlock + ARG 4 log + ARG 5 planks + ARG 6 fence METHOD m_batvfvup getFence ()Lnet/minecraft/unmapped/C_txtbiemp; - METHOD m_fndnndni byIndex (I)Lnet/minecraft/unmapped/C_jdubdjcx$C_apnarkxp; - ARG 0 index + METHOD m_fndnndni byId (I)Lnet/minecraft/unmapped/C_jdubdjcx$C_apnarkxp; + ARG 0 id METHOD m_ujadfkwf getName ()Ljava/lang/String; METHOD m_unjckhwl getLog ()Lnet/minecraft/unmapped/C_txtbiemp; METHOD m_ytsldifq getPlanks ()Lnet/minecraft/unmapped/C_txtbiemp; diff --git a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping index f020d16623..1e90117d5d 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping @@ -69,6 +69,7 @@ CLASS net/minecraft/unmapped/C_uegwgivt net/minecraft/world/poi/PointOfInterestS METHOD m_safkagzh shouldScan (Lnet/minecraft/unmapped/C_aurosfgf;)Z ARG 0 section METHOD m_ssqvzvty hasTypeAt (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_hynzadkk;)Z + ARG 1 type ARG 2 pos METHOD m_tjmtajvw getPosition (Ljava/util/function/Predicate;Ljava/util/function/BiPredicate;Lnet/minecraft/unmapped/C_hynzadkk;I)Ljava/util/Optional; ARG 1 typePredicate diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 064d773f0b..df31eacc28 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -72,7 +72,7 @@ CLASS net/minecraft/unmapped/C_jzcarjio net/minecraft/world/updater/WorldUpdater METHOD m_rqoeibmv tryUpdate (Ljava/lang/AutoCloseable;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_xhhleach;)Z ARG 1 storage ARG 2 pos - ARG 3 worldKey + ARG 3 world METHOD m_tkgcolez getDimensionsToUpdate ()Ljava/util/List; CLASS C_kxqvuzjo Region CLASS C_nzimilha ChunkUpdater diff --git a/simple_type_field_names.json5 b/simple_type_field_names.json5 index 5e9fd427ec..7e2eac823d 100644 --- a/simple_type_field_names.json5 +++ b/simple_type_field_names.json5 @@ -8,8 +8,10 @@ "dynOps" ] }, + "com/mojang/serialization/codecs/RecordCodecBuilder$Instance": "instance", "com/mojang/serialization/MapCodec": "codec", "net/minecraft/unmapped/C_qsrmwluu": "packetCodec", // PacketCodec + "com/mojang/datafixers/util/Pair": "pair", // Data "net/minecraft/unmapped/C_nykrdyol": "exporter", // RecipeExporter @@ -27,10 +29,20 @@ "net/minecraft/unmapped/C_pennblrk": "source", // ServerCommandSource // Registries - "net/minecraft/unmapped/C_tqxyjqsk": "registry", - "net/minecraft/unmapped/C_xhhleach": "registryKey", + "net/minecraft/unmapped/C_tqxyjqsk": { // Registry + local_name: "registry", + inherit: true + }, "net/minecraft/unmapped/C_wqxmvzdq": "registryManager", // DynamicRegistryManager "net/minecraft/unmapped/C_hqoyyfco": "context", // BootstrapContext + "net/minecraft/unmapped/C_ednuhnnn": "tag", // TagKey + "net/minecraft/unmapped/C_ncpywfca": { // Identifier + local_name: "id", + exclusive: true, + fallback: [ + "identifier" + ] + }, // Client "net/minecraft/unmapped/C_ayfeobid": "client", // MinecraftClient @@ -76,10 +88,23 @@ "net/minecraft/unmapped/C_mmxmpdoq": "block", "net/minecraft/unmapped/C_jdakttms": "result", // BlockHitResult "net/minecraft/unmapped/C_hgpogkhy": "type", // BlockSetType - "net/minecraft/unmapped/C_triydqro$C_xnkxsdfy": "settings", // AbstractBlock.Settings + "net/minecraft/unmapped/C_triydqro$C_xnkxsdfy": { // AbstractBlock.Settings + local_name: "settings", + exclusive: true, + fallback : [ + "blockSettings" + ] + }, // Item "net/minecraft/unmapped/C_sddaxwyk": "stack", // ItemStack + "net/minecraft/unmapped/C_vorddnax$C_bfrytpdl": { // Item.Settings + local_name: "settings", + exclusive: true, + fallback: [ + "itemSettings" + ] + }, "net/minecraft/unmapped/C_lnokcayd": { // ItemGroup local_name: "group", fallback: [ @@ -90,14 +115,31 @@ "net/minecraft/unmapped/C_lnokcayd$C_tndlmady": "visibility", // ItemGroup.Visibility // Entity + "net/minecraft/unmapped/C_astfners": "entity", // Entity + "net/minecraft/unmapped/C_usxaxydn": { // LivingEntity + local_name: "entity", + exclusive: true, + fallback: [ + "livingEntity" + ] + }, "net/minecraft/unmapped/C_rjqjaxef": "brain", - "net/minecraft/unmapped/C_uzzvxofv": { + "net/minecraft/unmapped/C_bhyaesep": { // SpawnReason local_name: "reason", fallback: [ "spawnReason" ] }, + // Village + "net/minecraft/unmapped/C_argwryfu": { // TradeOffer + local_name: "offer", + inherit: true, + fallback: [ + "tradeOffer" + ] + }, + // Player "net/minecraft/unmapped/C_jzrpycqo": { // PlayerEntity local_name: "player", @@ -138,6 +180,12 @@ // Network "net/minecraft/unmapped/C_idfydwco": "buf", // PacketByteBuf + "net/minecraft/unmapped/C_mnjlaveb$C_mlxyrlwl": { // TagNetworkSerialization$NetworkPayload + local_name: "payload", + fallback: [ + "networkPayload" + ] + }, // World "net/minecraft/unmapped/C_cdctfzbn": "world",