complete some things, simple type names, misc

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 {

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<File> inputJar;
+    public abstract RegularFileProperty getInputJar();
 
     @InputFile
-    private final Property<File> inputMappings;
+    public abstract RegularFileProperty getInputMappings();
 
     @InputFile
-    private final Property<File> profile;
+    public abstract RegularFileProperty getProfile();
+
+    @Optional
+    @InputFiles
+    protected abstract Property<FileCollection> 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<File> getInputJar() {
-        return inputJar;
-    }
-
-    public Property<File> getInputMappings() {
-        return inputMappings;
-    }
-
-    public Property<File> getProfile() {
-        return profile;
-    }
 }

buildSrc/src/main/resources/minecraft_specific_words.txt

@@ -516,6 +516,7 @@ unicode
 
 // registry
 memoize
+memoized
 unregister
 
 // javadoc

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

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

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;

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -227,8 +227,11 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 3 pos
 		ARG 4 context
 	CLASS C_eibemhky AbstractBlockState
+		FIELD f_biaogsvo FULL_CULLING_FACES [Lnet/minecraft/unmapped/C_zscvhwbd;
+		FIELD f_bvttwnii EMPTY_CULLING_FACES [Lnet/minecraft/unmapped/C_zscvhwbd;
 		FIELD f_ciiuhosx opaque Z
 		FIELD f_cmbiwnda hasSidedTransparency Z
+		FIELD f_gbcdxrgd DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
 		FIELD f_jnxtuzdb hardness F
 		FIELD f_jvcpotqu isAir Z
 		FIELD f_lpessbtt pistonBehavior Lnet/minecraft/unmapped/C_mojvzhua;
@@ -247,6 +250,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		FIELD f_wknecqnz luminance I
 		FIELD f_wvbmkgls suffocationPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
 		FIELD f_xwxdktuf hasRandomTicks 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;
 		FIELD f_zzuoeazs instrument Lnet/minecraft/unmapped/C_onjtjtsi;
@@ -431,6 +436,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
@@ -547,6 +553,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
@@ -593,6 +600,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
@@ -657,6 +666,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;

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

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

mappings/net/minecraft/block/TrialSpawnerConfig.mapping

@@ -1,9 +1,41 @@
 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
 	METHOD m_snjxtjjk getTotalMobs (I)I
 		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

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 <init> (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

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;

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

mappings/net/minecraft/block/entity/VaultBlockEntity.mapping

@@ -1 +1,4 @@
 CLASS net/minecraft/unmapped/C_xclnoluc net/minecraft/block/entity/VaultBlockEntity
+	CLASS C_vucktnfd
+		METHOD m_vsawgyip (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_sddaxwyk;
+			ARG 2 lootTable

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

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

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 <init> (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

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 <init> (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

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 <init> (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

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 <init> (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