Skip to content

Commit

Permalink
update to enigma 2.0 (#517)
Browse files Browse the repository at this point in the history 
* update to enigma 2.0

* use new profile

* update libs

* Fix `insertAutoGeneratedMappings`

---------

Co-authored-by: IotaBread <[email protected]>
  • Loading branch information
@ix0rai @IotaBread
ix0rai and IotaBread authored Dec 29, 2023
1 parent e1edf08 commit 7e33089
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 72 deletions.
51 changes: 27 additions & 24 deletions buildSrc/src/main/java/quilt/internal/tasks/build/AddProposedMappingsTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.BufferedWriter;
import java.io.File;
import java.io.PrintWriter;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
Expand All @@ -11,21 +12,19 @@
import java.util.Locale;
import java.util.Objects;

import com.google.common.collect.Streams;
import cuchaz.enigma.Enigma;
import cuchaz.enigma.EnigmaProfile;
import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.api.service.NameProposalService;
import cuchaz.enigma.command.Command;
import cuchaz.enigma.command.FillClassMappingsCommand;
import cuchaz.enigma.command.InsertProposedMappingsCommand;
import cuchaz.enigma.command.MappingCommandsUtil;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.MappingDelta;
import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
import cuchaz.enigma.translation.mapping.tree.DeltaTrackingTree;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.utils.Utils;
import org.quiltmc.enigma.api.Enigma;
import org.quiltmc.enigma.api.EnigmaProfile;
import org.quiltmc.enigma.api.EnigmaProject;
import org.quiltmc.enigma.command.Command;
import org.quiltmc.enigma.command.FillClassMappingsCommand;
import org.quiltmc.enigma.command.MappingCommandsUtil;
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
import org.quiltmc.enigma.api.translation.mapping.MappingDelta;
import org.quiltmc.enigma.api.translation.mapping.serde.MappingSaveParameters;
import org.quiltmc.enigma.api.translation.mapping.tree.DeltaTrackingTree;
import org.quiltmc.enigma.api.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.util.EntryTreePrinter;
import org.quiltmc.enigma.util.Utils;
import net.fabricmc.mappingio.MappingWriter;
import net.fabricmc.mappingio.adapter.MappingDstNsReorder;
import net.fabricmc.mappingio.format.MappingFormat;
Expand Down Expand Up @@ -111,28 +110,27 @@ public static void addProposedMappings(Path input, Path output, Path tempDir, Pa

private static void runCommands(Path jar, Path input, Path output, String resultFormat, Path profilePath) throws Exception {
EnigmaProfile profile = EnigmaProfile.read(profilePath);
Enigma enigma = Command.createEnigma(profile);
Enigma enigma = Command.createEnigma(profile, null);

EnigmaProject project = Command.openProject(jar, input, enigma);
NameProposalService[] nameProposalServices = enigma.getServices().get(NameProposalService.TYPE).toArray(new NameProposalService[0]);

boolean debug = System.getProperty("qm.addProposedMappings.debug", "false").toLowerCase(Locale.ROOT).equals("true");
EntryTree<EntryMapping> withProposals = InsertProposedMappingsCommand.exec(nameProposalServices, project, debug);
EntryTree<EntryMapping> withProposals = project.getRemapper().getMappings(); // Proposed names are automatically added when opening a project

// TODO: Disable fillAll after fixing the tiny v2 writer to avoid adding unnecessary class names
EntryTree<EntryMapping> result = FillClassMappingsCommand.exec(project.getJarIndex(), withProposals, true, debug);

Utils.delete(output);
MappingSaveParameters saveParameters = enigma.getProfile().getMappingSaveParameters();
MappingCommandsUtil.write(result, resultFormat, output, saveParameters);
MappingSaveParameters profileParameters = enigma.getProfile().getMappingSaveParameters();
MappingSaveParameters saveParameters = new MappingSaveParameters(profileParameters.fileNameFormat(), /*writeProposedNames*/ true);
MappingCommandsUtil.getWriter(resultFormat).write(result, output, saveParameters);

if (debug) {
Path debugFile = output.getParent().resolve(output.getFileName().toString() + "-delta.txt");
MappingDelta<EntryMapping> proposalsDelta = ((DeltaTrackingTree<EntryMapping>) withProposals).takeDelta();
Path deltaFile = output.getParent().resolve(output.getFileName().toString() + "-fill-delta.txt");
MappingDelta<EntryMapping> fillDelta = ((DeltaTrackingTree<EntryMapping>) result).takeDelta();

try (BufferedWriter writer = Files.newBufferedWriter(debugFile)) {
List<String> content = Streams.concat(proposalsDelta.getChanges().getAllEntries(), fillDelta.getChanges().getAllEntries())
try (BufferedWriter writer = Files.newBufferedWriter(deltaFile)) {
List<String> content = fillDelta.getChanges().getAllEntries()
.map(Objects::toString)
.toList();

Expand All @@ -141,6 +139,11 @@ private static void runCommands(Path jar, Path input, Path output, String result
writer.newLine();
}
}

Path debugFile = output.getParent().resolve(output.getFileName().toString() + "-tree.txt");
try (BufferedWriter writer = Files.newBufferedWriter(debugFile)) {
EntryTreePrinter.print(new PrintWriter(writer), project.getRemapper().getProposedMappings());
}
}
}

Expand Down
5 changes: 2 additions & 3 deletions buildSrc/src/main/java/quilt/internal/tasks/build/BuildMappingsTinyTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.io.IOException;
import java.nio.file.Path;

import cuchaz.enigma.command.MapSpecializedMethodsCommand;
import cuchaz.enigma.translation.mapping.serde.MappingParseException;
import org.quiltmc.enigma.command.MapSpecializedMethodsCommand;
import org.quiltmc.enigma.api.translation.mapping.serde.MappingParseException;
import org.gradle.api.file.RegularFileProperty;
import org.gradle.api.tasks.InputDirectory;
import org.gradle.api.tasks.OutputFile;
Expand Down Expand Up @@ -45,7 +45,6 @@ public void execute() throws IOException, MappingParseException {
public static void buildMappingsTiny(Path perVersionMappingsJar, Path mappings, Path outputMappings) throws IOException, MappingParseException {
MapSpecializedMethodsCommand.run(
perVersionMappingsJar,
"enigma",
mappings,
String.format("tinyv2:%s:named", Constants.PER_VERSION_MAPPINGS_NAME),
outputMappings
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/quilt/internal/tasks/build/DropInvalidMappingsTask.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package quilt.internal.tasks.build;

import cuchaz.enigma.command.DropInvalidMappingsCommand;
import org.quiltmc.enigma.command.DropInvalidMappingsCommand;
import org.gradle.api.tasks.TaskAction;
import quilt.internal.Constants;
import quilt.internal.tasks.DefaultMappingsTask;
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/src/main/java/quilt/internal/tasks/lint/Checker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import java.util.Set;
import java.util.function.Function;

import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.representation.AccessFlags;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.FieldEntry;
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
import org.quiltmc.enigma.api.translation.representation.AccessFlags;
import org.quiltmc.enigma.api.translation.representation.entry.Entry;
import org.quiltmc.enigma.api.translation.representation.entry.FieldEntry;

/**
* A checker checks mapping entries for formatting/convention errors and warnings.
Expand Down
12 changes: 6 additions & 6 deletions buildSrc/src/main/java/quilt/internal/tasks/lint/EntryNamingChecker.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package quilt.internal.tasks.lint;

import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.representation.AccessFlags;
import cuchaz.enigma.translation.representation.entry.ClassEntry;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.FieldEntry;
import cuchaz.enigma.translation.representation.entry.MethodEntry;
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
import org.quiltmc.enigma.api.translation.representation.AccessFlags;
import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
import org.quiltmc.enigma.api.translation.representation.entry.Entry;
import org.quiltmc.enigma.api.translation.representation.entry.FieldEntry;
import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry;

import java.util.function.Function;

Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/java/quilt/internal/tasks/lint/FieldNamingChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import java.util.Locale;
import java.util.function.Function;

import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.representation.AccessFlags;
import cuchaz.enigma.translation.representation.TypeDescriptor;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.FieldEntry;
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
import org.quiltmc.enigma.api.translation.representation.AccessFlags;
import org.quiltmc.enigma.api.translation.representation.TypeDescriptor;
import org.quiltmc.enigma.api.translation.representation.entry.Entry;
import org.quiltmc.enigma.api.translation.representation.entry.FieldEntry;

public final class FieldNamingChecker implements Checker<FieldEntry> {
@Override
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/java/quilt/internal/tasks/lint/JavadocChecker.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package quilt.internal.tasks.lint;

import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.representation.AccessFlags;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.LocalVariableEntry;
import cuchaz.enigma.translation.representation.entry.MethodEntry;
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
import org.quiltmc.enigma.api.translation.representation.AccessFlags;
import org.quiltmc.enigma.api.translation.representation.entry.Entry;
import org.quiltmc.enigma.api.translation.representation.entry.LocalVariableEntry;
import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry;

import java.util.function.Function;
import java.util.regex.Pattern;
Expand Down
30 changes: 15 additions & 15 deletions buildSrc/src/main/java/quilt/internal/tasks/lint/MappingLintTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
import java.util.Set;
import java.util.function.Function;

import cuchaz.enigma.Enigma;
import cuchaz.enigma.EnigmaProject;
import cuchaz.enigma.ProgressListener;
import cuchaz.enigma.analysis.index.EntryIndex;
import cuchaz.enigma.classprovider.ClasspathClassProvider;
import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.mapping.serde.MappingParseException;
import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader;
import cuchaz.enigma.translation.mapping.tree.EntryTree;
import cuchaz.enigma.translation.representation.AccessFlags;
import cuchaz.enigma.translation.representation.entry.ClassEntry;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.MethodEntry;
import org.quiltmc.enigma.api.Enigma;
import org.quiltmc.enigma.api.EnigmaProject;
import org.quiltmc.enigma.api.ProgressListener;
import org.quiltmc.enigma.api.analysis.index.jar.EntryIndex;
import org.quiltmc.enigma.api.class_provider.ClasspathClassProvider;
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
import org.quiltmc.enigma.api.translation.mapping.serde.MappingParseException;
import org.quiltmc.enigma.api.translation.mapping.serde.enigma.EnigmaMappingsReader;
import org.quiltmc.enigma.api.translation.mapping.tree.EntryTree;
import org.quiltmc.enigma.api.translation.representation.AccessFlags;
import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
import org.quiltmc.enigma.api.translation.representation.entry.Entry;
import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry;
import javax.inject.Inject;
import org.gradle.api.GradleException;
import org.gradle.api.file.ConfigurableFileCollection;
Expand Down Expand Up @@ -154,9 +154,9 @@ public void execute() {
Enigma enigma = Enigma.create();
EnigmaProject project = enigma.openJar(params.getJarFile().get().getAsFile().toPath(), new ClasspathClassProvider(), ProgressListener.none());
EntryTree<EntryMapping> mappings = readMappings(getParameters().getMappingFiles());
project.setMappings(mappings);
project.setMappings(mappings, ProgressListener.none());
Function<Entry<?>, AccessFlags> accessProvider = entry -> {
EntryIndex index = project.getJarIndex().getEntryIndex();
EntryIndex index = project.getJarIndex().getIndex(EntryIndex.class);

if (entry instanceof ClassEntry c) {
return index.getClassAccess(c);
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/java/quilt/internal/tasks/lint/SpellingChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
import java.util.function.Predicate;
import java.util.stream.Collectors;

import cuchaz.enigma.translation.mapping.EntryMapping;
import cuchaz.enigma.translation.representation.AccessFlags;
import cuchaz.enigma.translation.representation.entry.ClassEntry;
import cuchaz.enigma.translation.representation.entry.Entry;
import cuchaz.enigma.translation.representation.entry.MethodEntry;
import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
import org.quiltmc.enigma.api.translation.representation.AccessFlags;
import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry;
import org.quiltmc.enigma.api.translation.representation.entry.Entry;
import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry;

public class SpellingChecker implements Checker<Entry<?>> {
private static final String PACKAGE_INFO_CLASS_PACKAGE = "net/minecraft/unused/packageinfo/";
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/quilt/internal/tasks/mappings/EnigmaMappingsTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class EnigmaMappingsTask extends JavaExec implements MappingsTask {
public EnigmaMappingsTask() {
this.setGroup(Constants.Groups.MAPPINGS_GROUP);
this.getMainClass().set("cuchaz.enigma.gui.Main");
this.getMainClass().set("org.quiltmc.enigma.gui.Main");
this.classpath(getProject().getConfigurations().getByName("enigmaRuntime"));
jarToMap = getObjectFactory().fileProperty();
jvmArgs("-Xmx2048m");
Expand Down
10 changes: 9 additions & 1 deletion enigma_profile.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@
"jar_indexer": {
"id": "quiltmc:jar_index",
"args": {
"custom_codecs": "net/minecraft/unmapped/C_fgetofav, net/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc, net/minecraft/unmapped/C_qosrsbdy, net/minecraft/unmapped/C_tyjpezxh$C_cuphesbl, net/minecraft/unmapped/C_tyjpezxh$C_shczgrzo, net/minecraft/unmapped/C_tyjpezxh$C_utmdutep, net/minecraft/unmapped/C_wbhfljwo",
"custom_codecs": [
"net/minecraft/unmapped/C_fgetofav",
"net/minecraft/unmapped/C_lgkqzafw$C_nxwenkbc",
"net/minecraft/unmapped/C_qosrsbdy",
"net/minecraft/unmapped/C_tyjpezxh$C_cuphesbl",
"net/minecraft/unmapped/C_tyjpezxh$C_shczgrzo",
"net/minecraft/unmapped/C_tyjpezxh$C_utmdutep",
"net/minecraft/unmapped/C_wbhfljwo"
],
"simple_type_field_names_path": "./simple_type_field_names.json5"
}
},
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ download_task = "4.1.1"
guava = "31.1-jre"
jackson_xml = "2.14.1"
launchermeta_parser = "1.0.0"
enigma = "1.9.0"
enigma_plugin = "1.4.0"
enigma = "2.0.0"
enigma_plugin = "2.0.0"
tiny_remapper = "0.7.2"
stitch = "0.6.1"
unpick = "3.0.6"
Expand Down

3 comments on commit 7e33089

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 7e33089, 967 file(s) were updated with 4430 line(s) added and 4399 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/platform/GlStateManager.java namedSrc/com/mojang/blaze3d/platform/GlStateManager.java
--- namedTargetSrc/com/mojang/blaze3d/platform/GlStateManager.java	2023-12-29 00:18:04.109491600 +0000
+++ namedSrc/com/mojang/blaze3d/platform/GlStateManager.java	2023-12-29 00:17:00.461997442 +0000
@@ -1402,59 +1402,73 @@
    @DeobfuscateClass
    public static enum DestFactor {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       CONSTANT_ALPHA(GL14.GL_CONSTANT_ALPHA),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       CONSTANT_COLOR(GL14.GL_CONSTANT_COLOR),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       DST_ALPHA(GL11.GL_DST_ALPHA),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       DST_COLOR(GL11.GL_DST_COLOR),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ONE Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ONE(GL11.GL_ONE),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ONE_MINUS_CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ONE_MINUS_CONSTANT_ALPHA(GL14.GL_ONE_MINUS_CONSTANT_ALPHA),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ONE_MINUS_CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ONE_MINUS_CONSTANT_COLOR(GL14.GL_ONE_MINUS_CONSTANT_COLOR),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ONE_MINUS_DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ONE_MINUS_DST_ALPHA(GL11.GL_ONE_MINUS_DST_ALPHA),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ONE_MINUS_DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ONE_MINUS_DST_COLOR(GL11.GL_ONE_MINUS_DST_COLOR),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ONE_MINUS_SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ONE_MINUS_SRC_ALPHA(GL11.GL_ONE_MINUS_SRC_ALPHA),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ONE_MINUS_SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ONE_MINUS_SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ONE_MINUS_SRC_COLOR(GL11.GL_ONE_MINUS_SRC_COLOR),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       SRC_ALPHA(GL11.GL_SRC_ALPHA),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       SRC_COLOR(GL11.GL_SRC_COLOR),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ZERO Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ZERO:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
+       * @mapping {@literal named ZERO Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;ZERO:Lcom/mojang/blaze3d/platform/GlStateManager$DestFactor;}
        */
       ZERO(GL11.GL_ZERO);
 
@@ -1642,63 +1656,78 @@
    @DeobfuscateClass
    public static enum SourceFactor {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       CONSTANT_ALPHA(32771),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       CONSTANT_COLOR(32769),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       DST_ALPHA(772),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       DST_COLOR(774),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ONE Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ONE(1),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ONE_MINUS_CONSTANT_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_CONSTANT_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ONE_MINUS_CONSTANT_ALPHA(32772),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ONE_MINUS_CONSTANT_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_CONSTANT_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ONE_MINUS_CONSTANT_COLOR(32770),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ONE_MINUS_DST_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_DST_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ONE_MINUS_DST_ALPHA(773),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ONE_MINUS_DST_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_DST_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ONE_MINUS_DST_COLOR(775),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ONE_MINUS_SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ONE_MINUS_SRC_ALPHA(771),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ONE_MINUS_SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ONE_MINUS_SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ONE_MINUS_SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ONE_MINUS_SRC_COLOR(769),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named SRC_ALPHA Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;SRC_ALPHA:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       SRC_ALPHA(770),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed SRC_ALPHA_SATURATE Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;SRC_ALPHA_SATURATE:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named SRC_ALPHA_SATURATE Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;SRC_ALPHA_SATURATE:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       SRC_ALPHA_SATURATE(776),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named SRC_COLOR Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;SRC_COLOR:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       SRC_COLOR(768),
       /**
-       * Mapping not found
+       * @mapping {@literal hashed ZERO Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ZERO:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
+       * @mapping {@literal named ZERO Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;ZERO:Lcom/mojang/blaze3d/platform/GlStateManager$SourceFactor;}
        */
       ZERO(0);
 
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementProgress.java namedSrc/net/minecraft/advancement/AdvancementProgress.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementProgress.java	2023-12-29 00:18:03.945492902 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementProgress.java	2023-12-29 00:17:00.201999508 +0000
@@ -283,7 +283,7 @@
    }
 
    /**
-    * @mapping {@literal hashed m_vsqhanji Lnet/minecraft/unmapped/C_rpzbknxp;m_vsqhanji(Lnet/minecraft/unmapped/C_rpzbknxp;)I}
+    * @mapping {@literal hashed compareTo Lnet/minecraft/unmapped/C_rpzbknxp;compareTo(Lnet/minecraft/unmapped/C_rpzbknxp;)I}
     * @mapping {@literal named compareTo Lnet/minecraft/advancement/AdvancementProgress;compareTo(Lnet/minecraft/advancement/AdvancementProgress;)I}
     */
    public int compareTo(AdvancementProgress arg) {
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java	2023-12-29 00:18:03.957492807 +0000
+++ namedSrc/net/minecraft/advancement/criterion/AbstractCriterionTrigger.java	2023-12-29 00:17:00.225999317 +0000
@@ -72,7 +72,7 @@
          for (CriterionTrigger.ConditionsContainer<T> lv3 : set) {
             T lv4 = lv3.conditions();
             if (predicate.test(lv4)) {
-               Optional<ContextAwarePredicate> optional = lv4.m_klqamsnl();
+               Optional<ContextAwarePredicate> optional = lv4.player();
                if (optional.isEmpty() || ((ContextAwarePredicate)optional.get()).test(lv2)) {
                   if (list == null) {
                      list = Lists.<CriterionTrigger.ConditionsContainer<T>>newArrayList();
@@ -101,12 +101,12 @@
        */
       @Override
       default void m_mmotanow(C_zybjffid arg) {
-         arg.m_nhvyihxi(this.m_klqamsnl(), ".player");
+         arg.m_nhvyihxi(this.player(), ".player");
       }
 
       /**
        * Mapping not found
        */
-      Optional<ContextAwarePredicate> m_klqamsnl();
+      Optional<ContextAwarePredicate> player();
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java	2023-12-29 00:18:04.045492107 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterionTrigger.java	2023-12-29 00:17:00.361998236 +0000
@@ -50,7 +50,7 @@
        */
       public static final Codec<BeeNestDestroyedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(Registries.BLOCK.holderByNameCodec(), "block").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::block),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(BeeNestDestroyedCriterionTrigger.Conditions::item),
                   Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "num_bees_inside", NumberRange.IntRange.ANY)
@@ -85,13 +85,5 @@
             return this.item.isPresent() && !((ItemPredicate)this.item.get()).test(stack) ? false : this.beesInside.test(count);
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java	2023-12-29 00:18:03.937492966 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterionTrigger.java	2023-12-29 00:17:00.189999603 +0000
@@ -54,7 +54,7 @@
        */
       public static final Codec<BredAnimalsCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BredAnimalsCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BredAnimalsCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "parent").forGetter(BredAnimalsCriterionTrigger.Conditions::parent),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "partner").forGetter(BredAnimalsCriterionTrigger.Conditions::partner),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "child").forGetter(BredAnimalsCriterionTrigger.Conditions::child)
@@ -130,13 +130,5 @@
          arg.m_nhvyihxi(this.partner, ".partner");
          arg.m_nhvyihxi(this.child, ".child");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java	2023-12-29 00:18:03.969492711 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterionTrigger.java	2023-12-29 00:17:00.241999190 +0000
@@ -44,7 +44,7 @@
        */
       public static final Codec<BrewedPotionCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BrewedPotionCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(BrewedPotionCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(Registries.POTION.holderByNameCodec(), "potion").forGetter(BrewedPotionCriterionTrigger.Conditions::potion)
                )
                .apply(instance, BrewedPotionCriterionTrigger.Conditions::new)
@@ -65,13 +65,5 @@
       public boolean matches(Holder<Potion> arg) {
          return !this.potion.isPresent() || ((Holder)this.potion.get()).equals(arg);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2023-12-29 00:18:03.961492775 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterionTrigger.java	2023-12-29 00:17:00.229999286 +0000
@@ -45,7 +45,7 @@
        */
       public static final Codec<ChangedDimensionCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ChangedDimensionCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ChangedDimensionCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(RegistryKey.codec(RegistryKeys.WORLD), "from").forGetter(ChangedDimensionCriterionTrigger.Conditions::from),
                   Codecs.m_cjqijzpr(RegistryKey.codec(RegistryKeys.WORLD), "to").forGetter(ChangedDimensionCriterionTrigger.Conditions::to)
                )
@@ -95,13 +95,5 @@
             return !this.to.isPresent() || this.to.get() == to;
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java	2023-12-29 00:18:04.013492362 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterionTrigger.java	2023-12-29 00:17:00.313998618 +0000
@@ -50,7 +50,7 @@
        */
       public static final Codec<ChanneledLightningCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ChanneledLightningCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ChanneledLightningCriterionTrigger.Conditions::player),
                   Codecs.m_aeryaqrd(EntityPredicate.f_uvagahsk.listOf(), "victims", List.of())
                      .forGetter(ChanneledLightningCriterionTrigger.Conditions::victims)
                )
@@ -97,13 +97,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_svooszyh(this.victims, ".victims");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java	2023-12-29 00:18:03.929493029 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterionTrigger.java	2023-12-29 00:17:00.181999667 +0000
@@ -42,7 +42,7 @@
        */
       public static final Codec<ConstructBeaconCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ConstructBeaconCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ConstructBeaconCriterionTrigger.Conditions::player),
                   Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "level", NumberRange.IntRange.ANY).forGetter(ConstructBeaconCriterionTrigger.Conditions::level)
                )
                .apply(instance, ConstructBeaconCriterionTrigger.Conditions::new)
@@ -71,13 +71,5 @@
       public boolean matches(int level) {
          return this.level.test(level);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java	2023-12-29 00:18:04.037492172 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterionTrigger.java	2023-12-29 00:17:00.353998300 +0000
@@ -44,7 +44,7 @@
        */
       public static final Codec<ConsumeItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ConsumeItemCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ConsumeItemCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(ConsumeItemCriterionTrigger.Conditions::item)
                )
                .apply(instance, ConsumeItemCriterionTrigger.Conditions::new)
@@ -81,13 +81,5 @@
       public boolean matches(ItemStack stack) {
          return this.item.isEmpty() || ((ItemPredicate)this.item.get()).test(stack);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java	2023-12-29 00:18:04.029492235 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger.java	2023-12-29 00:17:00.333998459 +0000
@@ -49,7 +49,7 @@
        */
       public static final Codec<CuredZombieVillagerCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(CuredZombieVillagerCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(CuredZombieVillagerCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "zombie").forGetter(CuredZombieVillagerCriterionTrigger.Conditions::zombie),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "villager").forGetter(CuredZombieVillagerCriterionTrigger.Conditions::villager)
                )
@@ -87,14 +87,6 @@
       }
 
       /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
-
-      /**
        * @mapping {@literal hashed m_auouvwij Lnet/minecraft/unmapped/C_urcewduq$C_izcpkdrl;m_auouvwij()Ljava/util/Optional;}
        * @mapping {@literal named zombie Lnet/minecraft/advancement/criterion/CuredZombieVillagerCriterionTrigger$Conditions;zombie()Ljava/util/Optional;}
        */
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java	2023-12-29 00:18:04.061491981 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterionTrigger.java	2023-12-29 00:17:00.385998045 +0000
@@ -49,7 +49,7 @@
        */
       public static final Codec<EffectsChangedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EffectsChangedCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EffectsChangedCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityEffectPredicate.CODEC, "effects").forGetter(EffectsChangedCriterionTrigger.Conditions::effects),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "source").forGetter(EffectsChangedCriterionTrigger.Conditions::source)
                )
@@ -93,13 +93,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.source, ".source");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java	2023-12-29 00:18:03.985492584 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterionTrigger.java	2023-12-29 00:17:00.265999000 +0000
@@ -45,7 +45,7 @@
        */
       public static final Codec<EnchantedItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EnchantedItemCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EnchantedItemCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(EnchantedItemCriterionTrigger.Conditions::item),
                   Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "levels", NumberRange.IntRange.ANY).forGetter(EnchantedItemCriterionTrigger.Conditions::levels)
                )
@@ -71,13 +71,5 @@
             return this.levels.test(levels);
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2023-12-29 00:18:04.013492362 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterionTrigger.java	2023-12-29 00:17:00.313998618 +0000
@@ -49,7 +49,7 @@
       public static final Codec<EnterBlockCriterionTrigger.Conditions> CODEC = Codecs.validate(
          RecordCodecBuilder.create(
             instance -> instance.group(
-                     Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EnterBlockCriterionTrigger.Conditions::m_klqamsnl),
+                     Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EnterBlockCriterionTrigger.Conditions::player),
                      Codecs.m_cjqijzpr(Registries.BLOCK.holderByNameCodec(), "block").forGetter(EnterBlockCriterionTrigger.Conditions::block),
                      Codecs.m_cjqijzpr(StatePredicate.f_oreeybze, "state").forGetter(EnterBlockCriterionTrigger.Conditions::state)
                   )
@@ -91,13 +91,5 @@
             return !this.state.isPresent() || ((StatePredicate)this.state.get()).test(state);
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java	2023-12-29 00:18:03.997492489 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.java	2023-12-29 00:17:00.289998809 +0000
@@ -43,7 +43,7 @@
        */
       public static final Codec<EntityHurtPlayerCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EntityHurtPlayerCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(EntityHurtPlayerCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(DamagePredicate.CODEC, "damage").forGetter(EntityHurtPlayerCriterionTrigger.Conditions::damage)
                )
                .apply(instance, EntityHurtPlayerCriterionTrigger.Conditions::new)
@@ -80,13 +80,5 @@
       public boolean matches(ServerPlayerEntity player, DamageSource source, float dealt, float taken, boolean blocked) {
          return !this.damage.isPresent() || ((DamagePredicate)this.damage.get()).test(player, source, dealt, taken, blocked);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java	2023-12-29 00:18:04.041492140 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterionTrigger.java	2023-12-29 00:17:00.353998300 +0000
@@ -43,7 +43,7 @@
        */
       public static final Codec<FilledBucketCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(FilledBucketCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(FilledBucketCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(FilledBucketCriterionTrigger.Conditions::item)
                )
                .apply(instance, FilledBucketCriterionTrigger.Conditions::new)
@@ -64,13 +64,5 @@
       public boolean matches(ItemStack stack) {
          return !this.item.isPresent() || ((ItemPredicate)this.item.get()).test(stack);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2023-12-29 00:18:04.125491472 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger.java	2023-12-29 00:17:00.485997251 +0000
@@ -55,7 +55,7 @@
        */
       public static final Codec<FishingRodHookedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(FishingRodHookedCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(FishingRodHookedCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "rod").forGetter(FishingRodHookedCriterionTrigger.Conditions::rod),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(FishingRodHookedCriterionTrigger.Conditions::entity),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(FishingRodHookedCriterionTrigger.Conditions::item)
@@ -117,14 +117,6 @@
       }
 
       /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
-
-      /**
        * @mapping {@literal hashed m_oywkidcr Lnet/minecraft/unmapped/C_wpdvydim$C_mnduyaqi;m_oywkidcr()Ljava/util/Optional;}
        * @mapping {@literal named entity Lnet/minecraft/advancement/criterion/FishingRodHookedCriterionTrigger$Conditions;entity()Ljava/util/Optional;}
        */
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java	2023-12-29 00:18:04.005492425 +0000
+++ namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger.java	2023-12-29 00:17:00.301998713 +0000
@@ -76,7 +76,7 @@
        */
       public static final Codec<InventoryChangedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(InventoryChangedCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(InventoryChangedCriterionTrigger.Conditions::player),
                   Codecs.m_aeryaqrd(
                         InventoryChangedCriterionTrigger.Conditions.C_iakmulom.CODEC,
                         "slots",
@@ -163,14 +163,6 @@
       }
 
       /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
-
-      /**
        * @mapping {@literal hashed net/minecraft/unmapped/C_wqesddch$C_bvmbsujf$C_iakmulom}
        * @mapping {@literal named net/minecraft/advancement/criterion/InventoryChangedCriterionTrigger$Conditions$C_iakmulom}
        */
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java	2023-12-29 00:18:04.133491409 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterionTrigger.java	2023-12-29 00:17:00.497997155 +0000
@@ -46,7 +46,7 @@
        */
       public static final Codec<ItemDurabilityChangedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::item),
                   Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "durability", NumberRange.IntRange.ANY)
                      .forGetter(ItemDurabilityChangedCriterionTrigger.Conditions::durability),
@@ -88,13 +88,5 @@
             return this.delta.test(stack.getDamage() - durability);
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2023-12-29 00:18:03.981492616 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterionTrigger.java	2023-12-29 00:17:00.261999032 +0000
@@ -68,7 +68,7 @@
        */
       public static final Codec<ItemUsedOnLocationCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ItemUsedOnLocationCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ItemUsedOnLocationCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ContextAwarePredicate.CODEC, "location").forGetter(ItemUsedOnLocationCriterionTrigger.Conditions::location)
                )
                .apply(instance, ItemUsedOnLocationCriterionTrigger.Conditions::new)
@@ -139,13 +139,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          this.location.ifPresent(arg2 -> arg.m_fgshsjad(arg2, LootContextTypes.ADVANCEMENT_LOCATION, ".location"));
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java	2023-12-29 00:18:04.037492172 +0000
+++ namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterionTrigger.java	2023-12-29 00:17:00.353998300 +0000
@@ -61,7 +61,7 @@
        */
       public static final Codec<KilledByCrossbowCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(KilledByCrossbowCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(KilledByCrossbowCriterionTrigger.Conditions::player),
                   Codecs.m_aeryaqrd(EntityPredicate.f_uvagahsk.listOf(), "victims", List.of()).forGetter(KilledByCrossbowCriterionTrigger.Conditions::victims),
                   Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "unique_entity_types", NumberRange.IntRange.ANY)
                      .forGetter(KilledByCrossbowCriterionTrigger.Conditions::uniqueEntityTypes)
@@ -124,13 +124,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_svooszyh(this.victims, ".victims");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java	2023-12-29 00:18:03.969492711 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LevitationCriterionTrigger.java	2023-12-29 00:17:00.241999190 +0000
@@ -45,7 +45,7 @@
        */
       public static final Codec<LevitationCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LevitationCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LevitationCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(DistancePredicate.CODEC, "distance").forGetter(LevitationCriterionTrigger.Conditions::distance),
                   Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "duration", NumberRange.IntRange.ANY)
                      .forGetter(LevitationCriterionTrigger.Conditions::duration)
@@ -73,13 +73,5 @@
             return this.duration.test(duration);
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java	2023-12-29 00:18:03.993492520 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterionTrigger.java	2023-12-29 00:17:00.277998904 +0000
@@ -52,7 +52,7 @@
        */
       public static final Codec<LightningStrikeCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LightningStrikeCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LightningStrikeCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "lightning").forGetter(LightningStrikeCriterionTrigger.Conditions::lightning),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "bystander").forGetter(LightningStrikeCriterionTrigger.Conditions::bystander)
                )
@@ -91,13 +91,5 @@
          arg.m_nhvyihxi(this.lightning, ".lightning");
          arg.m_nhvyihxi(this.bystander, ".bystander");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java	2023-12-29 00:18:04.049492076 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LocationCriterionTrigger.java	2023-12-29 00:17:00.369998173 +0000
@@ -46,7 +46,7 @@
        * @mapping {@literal named CODEC Lnet/minecraft/advancement/criterion/LocationCriterionTrigger$Conditions;CODEC:Lcom/mojang/serialization/Codec;}
        */
       public static final Codec<LocationCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
-         instance -> instance.group(Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LocationCriterionTrigger.Conditions::m_klqamsnl))
+         instance -> instance.group(Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(LocationCriterionTrigger.Conditions::player))
                .apply(instance, LocationCriterionTrigger.Conditions::new)
       );
 
@@ -118,13 +118,5 @@
                .steppingOn(LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().blocks(block)))
          );
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java	2023-12-29 00:18:03.993492520 +0000
+++ namedSrc/net/minecraft/advancement/criterion/OnKilledCriterionTrigger.java	2023-12-29 00:17:00.281998872 +0000
@@ -48,7 +48,7 @@
        */
       public static final Codec<OnKilledCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(OnKilledCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(OnKilledCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(OnKilledCriterionTrigger.Conditions::entityPredicate),
                   Codecs.m_cjqijzpr(DamageSourcePredicate.CODEC, "killing_blow").forGetter(OnKilledCriterionTrigger.Conditions::killingBlow)
                )
@@ -225,14 +225,6 @@
       }
 
       /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
-
-      /**
        * @mapping {@literal hashed m_voopcnep Lnet/minecraft/unmapped/C_hqkuepng$C_zknwqjsw;m_voopcnep()Ljava/util/Optional;}
        * @mapping {@literal named entityPredicate Lnet/minecraft/advancement/criterion/OnKilledCriterionTrigger$Conditions;entityPredicate()Ljava/util/Optional;}
        */
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java	2023-12-29 00:18:04.053492044 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterionTrigger.java	2023-12-29 00:17:00.373998141 +0000
@@ -49,7 +49,7 @@
        */
       public static final Codec<PickedUpThrownItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::item),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(PickedUpThrownItemCriterionTrigger.Conditions::entity)
                )
@@ -96,13 +96,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.entity, ".entity");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2023-12-29 00:18:04.013492362 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.java	2023-12-29 00:17:00.309998650 +0000
@@ -42,7 +42,7 @@
        */
       public static final Codec<PlayerGeneratesContainerLootCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::player),
                   Identifier.CODEC.fieldOf("loot_table").forGetter(PlayerGeneratesContainerLootCriterionTrigger.Conditions::lootTable)
                )
                .apply(instance, PlayerGeneratesContainerLootCriterionTrigger.Conditions::new)
@@ -63,13 +63,5 @@
       public boolean matches(Identifier lootTable) {
          return this.lootTable.equals(lootTable);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java	2023-12-29 00:18:03.941492933 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.java	2023-12-29 00:17:00.201999508 +0000
@@ -48,7 +48,7 @@
        */
       public static final Codec<PlayerHurtEntityCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(DamagePredicate.CODEC, "damage").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::damage),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(PlayerHurtEntityCriterionTrigger.Conditions::entity)
                )
@@ -126,13 +126,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.entity, ".entity");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java	2023-12-29 00:18:03.985492584 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterionTrigger.java	2023-12-29 00:17:00.265999000 +0000
@@ -48,7 +48,7 @@
        */
       public static final Codec<PlayerInteractedWithEntityCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::item),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(PlayerInteractedWithEntityCriterionTrigger.Conditions::entity)
                )
@@ -96,13 +96,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.entity, ".entity");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java	2023-12-29 00:18:04.069491917 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.java	2023-12-29 00:17:00.397997951 +0000
@@ -48,7 +48,7 @@
        */
       public static final Codec<RecipeCraftedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(RecipeCraftedCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(RecipeCraftedCriterionTrigger.Conditions::player),
                   Identifier.CODEC.fieldOf("recipe_id").forGetter(RecipeCraftedCriterionTrigger.Conditions::recipeId),
                   Codecs.m_aeryaqrd(ItemPredicate.f_jzkgbumt.listOf(), "ingredients", List.of())
                      .forGetter(RecipeCraftedCriterionTrigger.Conditions::ingredients)
@@ -103,13 +103,5 @@
             return true;
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java	2023-12-29 00:18:04.133491409 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.java	2023-12-29 00:17:00.497997155 +0000
@@ -51,7 +51,7 @@
        */
       public static final Codec<RecipeUnlockedCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(RecipeUnlockedCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(RecipeUnlockedCriterionTrigger.Conditions::player),
                   Identifier.CODEC.fieldOf("recipe").forGetter(RecipeUnlockedCriterionTrigger.Conditions::recipe)
                )
                .apply(instance, RecipeUnlockedCriterionTrigger.Conditions::new)
@@ -64,13 +64,5 @@
       public boolean matches(RecipeHolder<?> unlocker) {
          return this.recipe.equals(unlocker.id());
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java	2023-12-29 00:18:03.981492616 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterionTrigger.java	2023-12-29 00:17:00.261999032 +0000
@@ -44,7 +44,7 @@
        */
       public static final Codec<ShotCrossbowCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ShotCrossbowCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(ShotCrossbowCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(ShotCrossbowCriterionTrigger.Conditions::item)
                )
                .apply(instance, ShotCrossbowCriterionTrigger.Conditions::new)
@@ -74,13 +74,5 @@
       public boolean matches(ItemStack stack) {
          return this.item.isEmpty() || ((ItemPredicate)this.item.get()).test(stack);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2023-12-29 00:18:04.097491694 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterionTrigger.java	2023-12-29 00:17:00.441997600 +0000
@@ -49,7 +49,7 @@
       public static final Codec<SlideDownBlockCriterionTrigger.Conditions> CODEC = Codecs.validate(
          RecordCodecBuilder.create(
             instance -> instance.group(
-                     Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(SlideDownBlockCriterionTrigger.Conditions::m_klqamsnl),
+                     Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(SlideDownBlockCriterionTrigger.Conditions::player),
                      Codecs.m_cjqijzpr(Registries.BLOCK.holderByNameCodec(), "block").forGetter(SlideDownBlockCriterionTrigger.Conditions::block),
                      Codecs.m_cjqijzpr(StatePredicate.f_oreeybze, "state").forGetter(SlideDownBlockCriterionTrigger.Conditions::state)
                   )
@@ -91,13 +91,5 @@
             return !this.state.isPresent() || ((StatePredicate)this.state.get()).test(state);
          }
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java	2023-12-29 00:18:03.953492838 +0000
+++ namedSrc/net/minecraft/advancement/criterion/StartedRidingCriterionTrigger.java	2023-12-29 00:17:00.221999349 +0000
@@ -40,7 +40,7 @@
        * @mapping {@literal named CODEC Lnet/minecraft/advancement/criterion/StartedRidingCriterionTrigger$Conditions;CODEC:Lcom/mojang/serialization/Codec;}
        */
       public static final Codec<StartedRidingCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
-         instance -> instance.group(Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(StartedRidingCriterionTrigger.Conditions::m_klqamsnl))
+         instance -> instance.group(Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(StartedRidingCriterionTrigger.Conditions::player))
                .apply(instance, StartedRidingCriterionTrigger.Conditions::new)
       );
 
@@ -51,13 +51,5 @@
       public static AdvancementCriterion<StartedRidingCriterionTrigger.Conditions> create(EntityPredicate.Builder player) {
          return Criteria.STARTED_RIDING.create(new StartedRidingCriterionTrigger.Conditions(Optional.of(EntityPredicate.fromBuilder(player))));
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java	2023-12-29 00:18:04.009492394 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterionTrigger.java	2023-12-29 00:17:00.309998650 +0000
@@ -46,7 +46,7 @@
        */
       public static final Codec<SummonedEntityCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(SummonedEntityCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(SummonedEntityCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(SummonedEntityCriterionTrigger.Conditions::entity)
                )
                .apply(instance, SummonedEntityCriterionTrigger.Conditions::new)
@@ -77,13 +77,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.entity, ".entity");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java	2023-12-29 00:18:04.053492044 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterionTrigger.java	2023-12-29 00:17:00.377998110 +0000
@@ -46,7 +46,7 @@
        */
       public static final Codec<TameAnimalCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TameAnimalCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TameAnimalCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "entity").forGetter(TameAnimalCriterionTrigger.Conditions::entity)
                )
                .apply(instance, TameAnimalCriterionTrigger.Conditions::new)
@@ -84,13 +84,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.entity, ".entity");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java	2023-12-29 00:18:04.077491853 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TargetHitCriterionTrigger.java	2023-12-29 00:17:00.413997823 +0000
@@ -48,7 +48,7 @@
        */
       public static final Codec<TargetHitCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TargetHitCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TargetHitCriterionTrigger.Conditions::player),
                   Codecs.m_aeryaqrd(NumberRange.IntRange.CODEC, "signal_strength", NumberRange.IntRange.ANY)
                      .forGetter(TargetHitCriterionTrigger.Conditions::signalStrength),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "projectile").forGetter(TargetHitCriterionTrigger.Conditions::projectile)
@@ -86,13 +86,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.projectile, ".projectile");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java	2023-12-29 00:18:04.101491663 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TravelCriterionTrigger.java	2023-12-29 00:17:00.445997569 +0000
@@ -47,7 +47,7 @@
        */
       public static final Codec<TravelCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TravelCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(TravelCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(LocationPredicate.CODEC, "start_position").forGetter(TravelCriterionTrigger.Conditions::startPosition),
                   Codecs.m_cjqijzpr(DistancePredicate.CODEC, "distance").forGetter(TravelCriterionTrigger.Conditions::distance)
                )
@@ -98,14 +98,6 @@
       }
 
       /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
-
-      /**
        * @mapping {@literal hashed m_hyfofpsb Lnet/minecraft/unmapped/C_ntathoag$C_mnjnxtmp;m_hyfofpsb()Ljava/util/Optional;}
        * @mapping {@literal named startPosition Lnet/minecraft/advancement/criterion/TravelCriterionTrigger$Conditions;startPosition()Ljava/util/Optional;}
        */
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java	2023-12-29 00:18:03.989492553 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsedEnderEyeCriterionTrigger.java	2023-12-29 00:17:00.277998904 +0000
@@ -45,7 +45,7 @@
        */
       public static final Codec<UsedEnderEyeCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsedEnderEyeCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsedEnderEyeCriterionTrigger.Conditions::player),
                   Codecs.m_aeryaqrd(NumberRange.FloatRange.CODEC, "distance", NumberRange.FloatRange.ANY)
                      .forGetter(UsedEnderEyeCriterionTrigger.Conditions::distance)
                )
@@ -59,13 +59,5 @@
       public boolean matches(double distance) {
          return this.distance.testSqrt(distance);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java	2023-12-29 00:18:04.109491600 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterionTrigger.java	2023-12-29 00:17:00.453997505 +0000
@@ -44,7 +44,7 @@
        */
       public static final Codec<UsedTotemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsedTotemCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsedTotemCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(UsedTotemCriterionTrigger.Conditions::item)
                )
                .apply(instance, UsedTotemCriterionTrigger.Conditions::new)
@@ -74,13 +74,5 @@
       public boolean matches(ItemStack stack) {
          return this.item.isEmpty() || ((ItemPredicate)this.item.get()).test(stack);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java	2023-12-29 00:18:04.077491853 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsingItemCriterionTrigger.java	2023-12-29 00:17:00.409997855 +0000
@@ -43,7 +43,7 @@
        */
       public static final Codec<UsingItemCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsingItemCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(UsingItemCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(UsingItemCriterionTrigger.Conditions::item)
                )
                .apply(instance, UsingItemCriterionTrigger.Conditions::new)
@@ -65,13 +65,5 @@
       public boolean test(ItemStack stack) {
          return !this.item.isPresent() || ((ItemPredicate)this.item.get()).test(stack);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java
--- namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java	2023-12-29 00:18:03.993492520 +0000
+++ namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterionTrigger.java	2023-12-29 00:17:00.285998841 +0000
@@ -48,7 +48,7 @@
        */
       public static final Codec<VillagerTradeCriterionTrigger.Conditions> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(VillagerTradeCriterionTrigger.Conditions::m_klqamsnl),
+                  Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "player").forGetter(VillagerTradeCriterionTrigger.Conditions::player),
                   Codecs.m_cjqijzpr(EntityPredicate.f_uvagahsk, "villager").forGetter(VillagerTradeCriterionTrigger.Conditions::villager),
                   Codecs.m_cjqijzpr(ItemPredicate.f_jzkgbumt, "item").forGetter(VillagerTradeCriterionTrigger.Conditions::item)
                )
@@ -92,13 +92,5 @@
          AbstractCriterionTrigger.Conditions.super.m_mmotanow(arg);
          arg.m_nhvyihxi(this.villager, ".villager");
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Optional<ContextAwarePredicate> m_klqamsnl() {
-         return this.player;
-      }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/AbstractBannerBlock.java namedSrc/net/minecraft/block/AbstractBannerBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractBannerBlock.java	2023-12-29 00:18:04.089491759 +0000
+++ namedSrc/net/minecraft/block/AbstractBannerBlock.java	2023-12-29 00:17:00.429997696 +0000
@@ -58,11 +58,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
       if (world.isClient) {
-         world.getBlockEntity(pos, BlockEntityType.BANNER).ifPresent(blockEntity -> blockEntity.readFrom(itemStack));
-      } else if (itemStack.hasCustomName()) {
-         world.getBlockEntity(pos, BlockEntityType.BANNER).ifPresent(blockEntity -> blockEntity.setCustomName(itemStack.getName()));
+         world.getBlockEntity(pos, BlockEntityType.BANNER).ifPresent(blockEntity -> blockEntity.readFrom(stack));
+      } else if (stack.hasCustomName()) {
+         world.getBlockEntity(pos, BlockEntityType.BANNER).ifPresent(blockEntity -> blockEntity.setCustomName(stack.getName()));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/AbstractFurnaceBlock.java namedSrc/net/minecraft/block/AbstractFurnaceBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractFurnaceBlock.java	2023-12-29 00:18:03.925493061 +0000
+++ namedSrc/net/minecraft/block/AbstractFurnaceBlock.java	2023-12-29 00:17:00.169999762 +0000
@@ -87,11 +87,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof AbstractFurnaceBlockEntity) {
-            ((AbstractFurnaceBlockEntity)lv).setCustomName(itemStack.getName());
+            ((AbstractFurnaceBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/AbstractPlantBlock.java namedSrc/net/minecraft/block/AbstractPlantBlock.java
--- namedTargetSrc/net/minecraft/block/AbstractPlantBlock.java	2023-12-29 00:18:03.921493092 +0000
+++ namedSrc/net/minecraft/block/AbstractPlantBlock.java	2023-12-29 00:17:00.169999762 +0000
@@ -22,10 +22,11 @@
  */
 public abstract class AbstractPlantBlock extends AbstractPlantPartBlock implements Fertilizable {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ymdmcjuw;<init>(Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_zscvhwbd;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/AbstractPlantBlock;<init>(Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/util/math/Direction;Lnet/minecraft/util/shape/VoxelShape;Z)V}
     */
-   protected AbstractPlantBlock(AbstractBlock.Settings arg, Direction arg2, VoxelShape arg3, boolean bl) {
-      super(arg, arg2, arg3, bl);
+   protected AbstractPlantBlock(AbstractBlock.Settings arg, Direction direction, VoxelShape arg3, boolean bl) {
+      super(arg, direction, arg3, bl);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/AttachedStemBlock.java namedSrc/net/minecraft/block/AttachedStemBlock.java
--- namedTargetSrc/net/minecraft/block/AttachedStemBlock.java	2023-12-29 00:18:04.105491631 +0000
+++ namedSrc/net/minecraft/block/AttachedStemBlock.java	2023-12-29 00:17:00.453997505 +0000
@@ -130,8 +130,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isOf(Blocks.FARMLAND);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isOf(Blocks.FARMLAND);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/AzaleaBlock.java namedSrc/net/minecraft/block/AzaleaBlock.java
--- namedTargetSrc/net/minecraft/block/AzaleaBlock.java	2023-12-29 00:18:04.081491822 +0000
+++ namedSrc/net/minecraft/block/AzaleaBlock.java	2023-12-29 00:17:00.413997823 +0000
@@ -54,8 +54,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isOf(Blocks.CLAY) || super.canPlantOnTop(floor, world, pos);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isOf(Blocks.CLAY) || super.canPlantOnTop(state, world, pos);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/BarrelBlock.java namedSrc/net/minecraft/block/BarrelBlock.java
--- namedTargetSrc/net/minecraft/block/BarrelBlock.java	2023-12-29 00:18:04.025492266 +0000
+++ namedSrc/net/minecraft/block/BarrelBlock.java	2023-12-29 00:17:00.329998491 +0000
@@ -122,11 +122,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof BarrelBlockEntity) {
-            ((BarrelBlockEntity)lv).setCustomName(itemStack.getName());
+            ((BarrelBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/BeaconBlock.java namedSrc/net/minecraft/block/BeaconBlock.java
--- namedTargetSrc/net/minecraft/block/BeaconBlock.java	2023-12-29 00:18:04.005492425 +0000
+++ namedSrc/net/minecraft/block/BeaconBlock.java	2023-12-29 00:17:00.297998745 +0000
@@ -96,11 +96,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof BeaconBlockEntity) {
-            ((BeaconBlockEntity)lv).setCustomName(itemStack.getName());
+            ((BeaconBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/BedBlock.java namedSrc/net/minecraft/block/BedBlock.java
--- namedTargetSrc/net/minecraft/block/BedBlock.java	2023-12-29 00:18:04.025492266 +0000
+++ namedSrc/net/minecraft/block/BedBlock.java	2023-12-29 00:17:00.325998522 +0000
@@ -446,8 +446,8 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      super.onPlaced(world, pos, state, placer, itemStack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      super.onPlaced(world, pos, state, placer, stack);
       if (!world.isClient) {
          BlockPos lv = pos.offset(state.get(FACING));
          world.setBlockState(lv, state.with(PART, BedPart.HEAD), Block.NOTIFY_ALL);
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2023-12-29 00:18:04.133491409 +0000
+++ namedSrc/net/minecraft/block/Block.java	2023-12-29 00:17:00.493997188 +0000
@@ -115,7 +115,7 @@
       .weakKeys()
       .build(new CacheLoader<VoxelShape, Boolean>() {
          /**
-          * @mapping {@literal hashed m_wfyobrph Lnet/minecraft/unmapped/C_mmxmpdoq$C_miiagdeq;m_wfyobrph(Lnet/minecraft/unmapped/C_zscvhwbd;)Ljava/lang/Boolean;}
+          * @mapping {@literal hashed load Lnet/minecraft/unmapped/C_mmxmpdoq$C_miiagdeq;load(Lnet/minecraft/unmapped/C_zscvhwbd;)Ljava/lang/Boolean;}
           * @mapping {@literal named load Lnet/minecraft/block/Block$C_miiagdeq;load(Lnet/minecraft/util/shape/VoxelShape;)Ljava/lang/Boolean;}
           */
          public Boolean load(VoxelShape arg) {
diff -bur namedTargetSrc/net/minecraft/block/BlockState.java namedSrc/net/minecraft/block/BlockState.java
--- namedTargetSrc/net/minecraft/block/BlockState.java	2023-12-29 00:18:04.081491822 +0000
+++ namedSrc/net/minecraft/block/BlockState.java	2023-12-29 00:17:00.413997823 +0000
@@ -18,10 +18,11 @@
    public static final Codec<BlockState> CODEC = createCodec(Registries.BLOCK.getCodec(), Block::getDefaultState).stable();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_txtbiemp;<init>(Lnet/minecraft/unmapped/C_mmxmpdoq;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/BlockState;<init>(Lnet/minecraft/block/Block;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V}
     */
-   public BlockState(Block arg, ImmutableMap<Property<?>, Comparable<?>> immutableMap, MapCodec<BlockState> mapCodec) {
-      super(arg, immutableMap, mapCodec);
+   public BlockState(Block block, ImmutableMap<Property<?>, Comparable<?>> immutableMap, MapCodec<BlockState> mapCodec) {
+      super(block, immutableMap, mapCodec);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/BrewingStandBlock.java namedSrc/net/minecraft/block/BrewingStandBlock.java
--- namedTargetSrc/net/minecraft/block/BrewingStandBlock.java	2023-12-29 00:18:04.069491917 +0000
+++ namedSrc/net/minecraft/block/BrewingStandBlock.java	2023-12-29 00:17:00.397997951 +0000
@@ -125,11 +125,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof BrewingStandBlockEntity) {
-            ((BrewingStandBlockEntity)lv).setCustomName(itemStack.getName());
+            ((BrewingStandBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2023-12-29 00:18:04.061491981 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2023-12-29 00:17:00.389998014 +0000
@@ -304,18 +304,18 @@
     * Mapping not found
     */
    @Override
-   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
-      if (!state.get(Properties.WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) {
-         boolean bl = state.get(LIT);
+   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
+      if (!blockState.get(Properties.WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) {
+         boolean bl = blockState.get(LIT);
          if (bl) {
             if (!world.isClient()) {
                world.playSound(null, pos, SoundEvents.ENTITY_GENERIC_EXTINGUISH_FIRE, SoundCategory.BLOCKS, 1.0F, 1.0F);
             }
 
-            extinguish(null, world, pos, state);
+            extinguish(null, world, pos, blockState);
          }
 
-         world.setBlockState(pos, state.with(WATERLOGGED, Boolean.valueOf(true)).with(LIT, Boolean.valueOf(false)), Block.NOTIFY_ALL);
+         world.setBlockState(pos, blockState.with(WATERLOGGED, Boolean.valueOf(true)).with(LIT, Boolean.valueOf(false)), Block.NOTIFY_ALL);
          world.scheduleFluidTick(pos, fluidState.getFluid(), fluidState.getFluid().getTickRate(world));
          return true;
       } else {
diff -bur namedTargetSrc/net/minecraft/block/CandleBlock.java namedSrc/net/minecraft/block/CandleBlock.java
--- namedTargetSrc/net/minecraft/block/CandleBlock.java	2023-12-29 00:18:04.041492140 +0000
+++ namedSrc/net/minecraft/block/CandleBlock.java	2023-12-29 00:17:00.357998268 +0000
@@ -215,10 +215,10 @@
     * Mapping not found
     */
    @Override
-   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
-      if (!state.get(WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) {
-         BlockState lv = state.with(WATERLOGGED, Boolean.valueOf(true));
-         if (state.get(LIT)) {
+   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
+      if (!blockState.get(WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) {
+         BlockState lv = blockState.with(WATERLOGGED, Boolean.valueOf(true));
+         if (blockState.get(LIT)) {
             extinguish(null, lv, world, pos);
          } else {
             world.setBlockState(pos, lv, Block.NOTIFY_ALL);
diff -bur namedTargetSrc/net/minecraft/block/ChestBlock.java namedSrc/net/minecraft/block/ChestBlock.java
--- namedTargetSrc/net/minecraft/block/ChestBlock.java	2023-12-29 00:18:04.081491822 +0000
+++ namedSrc/net/minecraft/block/ChestBlock.java	2023-12-29 00:17:00.413997823 +0000
@@ -354,11 +354,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof ChestBlockEntity) {
-            ((ChestBlockEntity)lv).setCustomName(itemStack.getName());
+            ((ChestBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/CommandBlock.java namedSrc/net/minecraft/block/CommandBlock.java
--- namedTargetSrc/net/minecraft/block/CommandBlock.java	2023-12-29 00:18:04.049492076 +0000
+++ namedSrc/net/minecraft/block/CommandBlock.java	2023-12-29 00:17:00.369998173 +0000
@@ -193,16 +193,16 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
       BlockEntity lv = world.getBlockEntity(pos);
       if (lv instanceof CommandBlockBlockEntity lv2) {
          CommandBlockExecutor lv3 = lv2.getCommandExecutor();
-         if (itemStack.hasCustomName()) {
-            lv3.setCustomName(itemStack.getName());
+         if (stack.hasCustomName()) {
+            lv3.setCustomName(stack.getName());
          }
 
          if (!world.isClient) {
-            if (BlockItem.getBlockEntityNbtFromStack(itemStack) == null) {
+            if (BlockItem.getBlockEntityNbtFromStack(stack) == null) {
                lv3.setTrackingOutput(world.getGameRules().getBooleanValue(GameRules.SEND_COMMAND_FEEDBACK));
                lv2.setAuto(this.auto);
             }
diff -bur namedTargetSrc/net/minecraft/block/ComposterBlock.java namedSrc/net/minecraft/block/ComposterBlock.java
--- namedTargetSrc/net/minecraft/block/ComposterBlock.java	2023-12-29 00:18:04.041492140 +0000
+++ namedSrc/net/minecraft/block/ComposterBlock.java	2023-12-29 00:17:00.353998300 +0000
@@ -506,23 +506,23 @@
        * Mapping not found
        */
       @Override
-      public int[] getAvailableSlots(Direction side) {
-         return side == Direction.UP ? new int[]{0} : new int[0];
+      public int[] getAvailableSlots(Direction direction) {
+         return direction == Direction.UP ? new int[]{0} : new int[0];
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) {
-         return !this.dirty && dir == Direction.UP && ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.containsKey(stack.getItem());
+      public boolean canInsert(int slot, ItemStack stack, @Nullable Direction direction) {
+         return !this.dirty && direction == Direction.UP && ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.containsKey(stack.getItem());
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public boolean canExtract(int slot, ItemStack stack, Direction dir) {
+      public boolean canExtract(int slot, ItemStack stack, Direction direction) {
          return false;
       }
 
@@ -557,7 +557,7 @@
        * Mapping not found
        */
       @Override
-      public int[] getAvailableSlots(Direction side) {
+      public int[] getAvailableSlots(Direction direction) {
          return new int[0];
       }
 
@@ -565,7 +565,7 @@
        * Mapping not found
        */
       @Override
-      public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) {
+      public boolean canInsert(int slot, ItemStack stack, @Nullable Direction direction) {
          return false;
       }
 
@@ -573,7 +573,7 @@
        * Mapping not found
        */
       @Override
-      public boolean canExtract(int slot, ItemStack stack, Direction dir) {
+      public boolean canExtract(int slot, ItemStack stack, Direction direction) {
          return false;
       }
    }
@@ -627,15 +627,15 @@
        * Mapping not found
        */
       @Override
-      public int[] getAvailableSlots(Direction side) {
-         return side == Direction.DOWN ? new int[]{0} : new int[0];
+      public int[] getAvailableSlots(Direction direction) {
+         return direction == Direction.DOWN ? new int[]{0} : new int[0];
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) {
+      public boolean canInsert(int slot, ItemStack stack, @Nullable Direction direction) {
          return false;
       }
 
@@ -643,8 +643,8 @@
        * Mapping not found
        */
       @Override
-      public boolean canExtract(int slot, ItemStack stack, Direction dir) {
-         return !this.dirty && dir == Direction.DOWN && stack.isOf(Items.BONE_MEAL);
+      public boolean canExtract(int slot, ItemStack stack, Direction direction) {
+         return !this.dirty && direction == Direction.DOWN && stack.isOf(Items.BONE_MEAL);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/block/ConduitBlock.java namedSrc/net/minecraft/block/ConduitBlock.java
--- namedTargetSrc/net/minecraft/block/ConduitBlock.java	2023-12-29 00:18:04.001492457 +0000
+++ namedSrc/net/minecraft/block/ConduitBlock.java	2023-12-29 00:17:00.293998777 +0000
@@ -132,11 +132,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof BeaconBlockEntity) {
-            ((BeaconBlockEntity)lv).setCustomName(itemStack.getName());
+            ((BeaconBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/Crafter.java namedSrc/net/minecraft/block/Crafter.java
--- namedTargetSrc/net/minecraft/block/Crafter.java	2023-12-29 00:18:03.965492743 +0000
+++ namedSrc/net/minecraft/block/Crafter.java	2023-12-29 00:17:00.237999222 +0000
@@ -182,11 +182,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity var7 = world.getBlockEntity(pos);
          if (var7 instanceof CrafterBlockEntity lv) {
-            lv.setCustomName(itemStack.getName());
+            lv.setCustomName(stack.getName());
          }
       }
 
diff -bur namedTargetSrc/net/minecraft/block/CropBlock.java namedSrc/net/minecraft/block/CropBlock.java
--- namedTargetSrc/net/minecraft/block/CropBlock.java	2023-12-29 00:18:03.905493220 +0000
+++ namedSrc/net/minecraft/block/CropBlock.java	2023-12-29 00:17:00.149999919 +0000
@@ -81,8 +81,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isOf(Blocks.FARMLAND);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isOf(Blocks.FARMLAND);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/DeadBushBlock.java namedSrc/net/minecraft/block/DeadBushBlock.java
--- namedTargetSrc/net/minecraft/block/DeadBushBlock.java	2023-12-29 00:18:04.109491600 +0000
+++ namedSrc/net/minecraft/block/DeadBushBlock.java	2023-12-29 00:17:00.457997474 +0000
@@ -53,7 +53,7 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isIn(BlockTags.DEAD_BUSH_PLACEABLE_ON);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isIn(BlockTags.DEAD_BUSH_PLACEABLE_ON);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2023-12-29 00:18:03.941492933 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2023-12-29 00:17:00.197999540 +0000
@@ -193,9 +193,9 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
       if (world.isClient) {
-         world.getBlockEntity(pos, BlockEntityType.DECORATED_POT).ifPresent(arg2 -> arg2.readNbt(itemStack));
+         world.getBlockEntity(pos, BlockEntityType.DECORATED_POT).ifPresent(arg2 -> arg2.readNbt(stack));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-12-29 00:18:04.029492235 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-12-29 00:17:00.341998396 +0000
@@ -180,12 +180,15 @@
             return super.getForce() * 1.25F;
          }
       });
-      DispenserBlock.registerBehavior(Items.SPLASH_POTION, new DispenserBehavior() {
+      DispenserBlock.registerBehavior(
+         Items.SPLASH_POTION,
+         new DispenserBehavior() {
          /**
-          * Mapping not found
+             * @mapping {@literal hashed dispense Lnet/minecraft/unmapped/C_ooeeaffg$C_gwoiejxt;dispense(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
+             * @mapping {@literal named dispense Lnet/minecraft/block/dispenser/DispenserBehavior$C_gwoiejxt;dispense(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
           */
          @Override
-         public ItemStack dispense(BlockPointer arg, ItemStack arg2) {
+            public ItemStack dispense(BlockPointer arg, ItemStack stack) {
             return (new ProjectileDispenserBehavior() {
                /**
                 * Mapping not found
@@ -210,15 +213,19 @@
                protected float getForce() {
                   return super.getForce() * 1.25F;
                }
-            }).dispense(arg, arg2);
+               }).dispense(arg, stack);
          }
-      });
-      DispenserBlock.registerBehavior(Items.LINGERING_POTION, new DispenserBehavior() {
+         }
+      );
+      DispenserBlock.registerBehavior(
+         Items.LINGERING_POTION,
+         new DispenserBehavior() {
          /**
-          * Mapping not found
+             * @mapping {@literal hashed dispense Lnet/minecraft/unmapped/C_ooeeaffg$C_couzaond;dispense(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
+             * @mapping {@literal named dispense Lnet/minecraft/block/dispenser/DispenserBehavior$C_couzaond;dispense(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
           */
          @Override
-         public ItemStack dispense(BlockPointer arg, ItemStack arg2) {
+            public ItemStack dispense(BlockPointer arg, ItemStack stack) {
             return (new ProjectileDispenserBehavior() {
                /**
                 * Mapping not found
@@ -243,9 +250,10 @@
                protected float getForce() {
                   return super.getForce() * 1.25F;
                }
-            }).dispense(arg, arg2);
+               }).dispense(arg, stack);
          }
-      });
+         }
+      );
       ItemDispenserBehavior lv = new ItemDispenserBehavior() {
          /**
           * Mapping not found
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java namedSrc/net/minecraft/block/dispenser/DispenserBlock.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBlock.java	2023-12-29 00:18:03.993492520 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBlock.java	2023-12-29 00:17:00.281998872 +0000
@@ -201,11 +201,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof DispenserBlockEntity) {
-            ((DispenserBlockEntity)lv).setCustomName(itemStack.getName());
+            ((DispenserBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2023-12-29 00:18:03.937492966 +0000
+++ namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2023-12-29 00:17:00.193999572 +0000
@@ -14,11 +14,12 @@
  */
 public class ItemDispenserBehavior implements DispenserBehavior {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed dispense Lnet/minecraft/unmapped/C_dnfsxzwl;dispense(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named dispense Lnet/minecraft/block/dispenser/ItemDispenserBehavior;dispense(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
     */
    @Override
-   public final ItemStack dispense(BlockPointer arg, ItemStack arg2) {
-      ItemStack lv = this.dispenseSilently(arg, arg2);
+   public final ItemStack dispense(BlockPointer arg, ItemStack stack) {
+      ItemStack lv = this.dispenseSilently(arg, stack);
       this.playSound(arg);
       this.spawnParticles(arg, arg.state().get(DispenserBlock.FACING));
       return lv;
diff -bur namedTargetSrc/net/minecraft/block/DoorBlock.java namedSrc/net/minecraft/block/DoorBlock.java
--- namedTargetSrc/net/minecraft/block/DoorBlock.java	2023-12-29 00:18:04.081491822 +0000
+++ namedSrc/net/minecraft/block/DoorBlock.java	2023-12-29 00:17:00.413997823 +0000
@@ -236,7 +236,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
       world.setBlockState(pos.up(), state.with(HALF, DoubleBlockHalf.UPPER), Block.NOTIFY_ALL);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/EnchantingTableBlock.java namedSrc/net/minecraft/block/EnchantingTableBlock.java
--- namedTargetSrc/net/minecraft/block/EnchantingTableBlock.java	2023-12-29 00:18:04.065491949 +0000
+++ namedSrc/net/minecraft/block/EnchantingTableBlock.java	2023-12-29 00:17:00.389998014 +0000
@@ -171,11 +171,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof EnchantingTableBlockEntity) {
-            ((EnchantingTableBlockEntity)lv).setCustomName(itemStack.getName());
+            ((EnchantingTableBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2023-12-29 00:18:03.965492743 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2023-12-29 00:17:00.237999222 +0000
@@ -522,11 +522,11 @@
     * Mapping not found
     */
    @Override
-   public int[] getAvailableSlots(Direction side) {
-      if (side == Direction.DOWN) {
+   public int[] getAvailableSlots(Direction direction) {
+      if (direction == Direction.DOWN) {
          return BOTTOM_SLOTS;
       } else {
-         return side == Direction.UP ? TOP_SLOTS : SIDE_SLOTS;
+         return direction == Direction.UP ? TOP_SLOTS : SIDE_SLOTS;
       }
    }
 
@@ -534,7 +534,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) {
+   public boolean canInsert(int slot, ItemStack stack, @Nullable Direction direction) {
       return this.isValid(slot, stack);
    }
 
@@ -542,8 +542,8 @@
     * Mapping not found
     */
    @Override
-   public boolean canExtract(int slot, ItemStack stack, Direction dir) {
-      if (dir == Direction.DOWN && slot == 1) {
+   public boolean canExtract(int slot, ItemStack stack, Direction direction) {
+      if (direction == Direction.DOWN && slot == 1) {
          return stack.isOf(Items.WATER_BUCKET) || stack.isOf(Items.BUCKET);
       } else {
          return true;
diff -bur namedTargetSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java	2023-12-29 00:18:03.961492775 +0000
+++ namedSrc/net/minecraft/block/entity/BlastFurnaceBlockEntity.java	2023-12-29 00:17:00.229999286 +0000
@@ -34,8 +34,8 @@
     * Mapping not found
     */
    @Override
-   protected int getFuelTime(ItemStack fuel) {
-      return super.getFuelTime(fuel) / 2;
+   protected int getFuelTime(ItemStack stack) {
+      return super.getFuelTime(stack) / 2;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2023-12-29 00:18:04.009492394 +0000
+++ namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2023-12-29 00:17:00.305998681 +0000
@@ -377,11 +377,11 @@
     * Mapping not found
     */
    @Override
-   public int[] getAvailableSlots(Direction side) {
-      if (side == Direction.UP) {
+   public int[] getAvailableSlots(Direction direction) {
+      if (direction == Direction.UP) {
          return TOP_SLOTS;
       } else {
-         return side == Direction.DOWN ? BOTTOM_SLOTS : SIDE_SLOTS;
+         return direction == Direction.DOWN ? BOTTOM_SLOTS : SIDE_SLOTS;
       }
    }
 
@@ -389,7 +389,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) {
+   public boolean canInsert(int slot, ItemStack stack, @Nullable Direction direction) {
       return this.isValid(slot, stack);
    }
 
@@ -397,7 +397,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canExtract(int slot, ItemStack stack, Direction dir) {
+   public boolean canExtract(int slot, ItemStack stack, Direction direction) {
       return slot == 3 ? stack.isOf(Items.GLASS_BOTTLE) : true;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.java namedSrc/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.java	2023-12-29 00:18:04.013492362 +0000
+++ namedSrc/net/minecraft/block/entity/CalibratedSculkSensorBlockEntity.java	2023-12-29 00:17:00.313998618 +0000
@@ -17,10 +17,11 @@
  */
 public class CalibratedSculkSensorBlockEntity extends SculkSensorBlockEntity {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_oxwhmuzx;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/CalibratedSculkSensorBlockEntity;<init>(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   public CalibratedSculkSensorBlockEntity(BlockPos arg, BlockState arg2) {
-      super(BlockEntityType.CALIBRATED_SCULK_SENSOR, arg, arg2);
+   public CalibratedSculkSensorBlockEntity(BlockPos pos, BlockState state) {
+      super(BlockEntityType.CALIBRATED_SCULK_SENSOR, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java namedSrc/net/minecraft/block/entity/ChestBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java	2023-12-29 00:18:04.045492107 +0000
+++ namedSrc/net/minecraft/block/entity/ChestBlockEntity.java	2023-12-29 00:17:00.361998236 +0000
@@ -88,10 +88,11 @@
    private final ChestLidAnimator lidAnimator = new ChestLidAnimator();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_idrrrnej;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/ChestBlockEntity;<init>(Lnet/minecraft/block/entity/BlockEntityType;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   protected ChestBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
-      super(arg, arg2, arg3);
+   protected ChestBlockEntity(BlockEntityType<?> arg, BlockPos pos, BlockState state) {
+      super(arg, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2023-12-29 00:18:04.037492172 +0000
+++ namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2023-12-29 00:17:00.349998332 +0000
@@ -29,10 +29,11 @@
    private DefaultedList<ItemStack> inventory = DefaultedList.ofSize(9, ItemStack.EMPTY);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zgeifnbq;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/DispenserBlockEntity;<init>(Lnet/minecraft/block/entity/BlockEntityType;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   protected DispenserBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
-      super(arg, arg2, arg3);
+   protected DispenserBlockEntity(BlockEntityType<?> arg, BlockPos pos, BlockState state) {
+      super(arg, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/DropperBlockEntity.java namedSrc/net/minecraft/block/entity/DropperBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DropperBlockEntity.java	2023-12-29 00:18:04.053492044 +0000
+++ namedSrc/net/minecraft/block/entity/DropperBlockEntity.java	2023-12-29 00:17:00.377998110 +0000
@@ -10,10 +10,11 @@
  */
 public class DropperBlockEntity extends DispenserBlockEntity {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hgelagbo;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/DropperBlockEntity;<init>(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   public DropperBlockEntity(BlockPos arg, BlockState arg2) {
-      super(BlockEntityType.DROPPER, arg, arg2);
+   public DropperBlockEntity(BlockPos pos, BlockState state) {
+      super(BlockEntityType.DROPPER, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2023-12-29 00:18:04.117491536 +0000
+++ namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2023-12-29 00:17:00.473997346 +0000
@@ -91,10 +91,11 @@
    private boolean exactTeleport;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bgmbcwaf;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/EndGatewayBlockEntity;<init>(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   public EndGatewayBlockEntity(BlockPos arg, BlockState arg2) {
-      super(BlockEntityType.END_GATEWAY, arg, arg2);
+   public EndGatewayBlockEntity(BlockPos pos, BlockState state) {
+      super(BlockEntityType.END_GATEWAY, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/EndPortalBlockEntity.java namedSrc/net/minecraft/block/entity/EndPortalBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EndPortalBlockEntity.java	2023-12-29 00:18:03.957492807 +0000
+++ namedSrc/net/minecraft/block/entity/EndPortalBlockEntity.java	2023-12-29 00:17:00.221999349 +0000
@@ -10,10 +10,11 @@
  */
 public class EndPortalBlockEntity extends BlockEntity {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jpevrssa;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/EndPortalBlockEntity;<init>(Lnet/minecraft/block/entity/BlockEntityType;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   protected EndPortalBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
-      super(arg, arg2, arg3);
+   protected EndPortalBlockEntity(BlockEntityType<?> arg, BlockPos pos, BlockState state) {
+      super(arg, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/HangingSignBlockEntity.java namedSrc/net/minecraft/block/entity/HangingSignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HangingSignBlockEntity.java	2023-12-29 00:18:04.125491472 +0000
+++ namedSrc/net/minecraft/block/entity/HangingSignBlockEntity.java	2023-12-29 00:17:00.485997251 +0000
@@ -22,10 +22,11 @@
    private static final int TEXT_LINE_HEIGHT = 9;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_qxcyquka;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/HangingSignBlockEntity;<init>(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   public HangingSignBlockEntity(BlockPos arg, BlockState arg2) {
-      super(BlockEntityType.HANGING_SIGN, arg, arg2);
+   public HangingSignBlockEntity(BlockPos pos, BlockState state) {
+      super(BlockEntityType.HANGING_SIGN, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2023-12-29 00:18:04.061491981 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2023-12-29 00:17:00.385998045 +0000
@@ -34,10 +34,11 @@
    private Text customName;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_uomuzarq;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/LockableContainerBlockEntity;<init>(Lnet/minecraft/block/entity/BlockEntityType;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   protected LockableContainerBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
-      super(arg, arg2, arg3);
+   protected LockableContainerBlockEntity(BlockEntityType<?> arg, BlockPos pos, BlockState state) {
+      super(arg, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2023-12-29 00:18:03.961492775 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2023-12-29 00:17:00.233999254 +0000
@@ -31,10 +31,11 @@
    protected long lootTableSeed;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_awquuxeb;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/LootableContainerBlockEntity;<init>(Lnet/minecraft/block/entity/BlockEntityType;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   protected LootableContainerBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
-      super(arg, arg2, arg3);
+   protected LootableContainerBlockEntity(BlockEntityType<?> arg, BlockPos pos, BlockState state) {
+      super(arg, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2023-12-29 00:18:04.069491917 +0000
+++ namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2023-12-29 00:17:00.401997919 +0000
@@ -72,7 +72,7 @@
    }
 
    /**
-    * @mapping {@literal hashed m_zuuuxfsm Lnet/minecraft/unmapped/C_mztoqymb;m_zuuuxfsm()Lnet/minecraft/unmapped/C_mztoqymb$C_gcdvmpek;}
+    * @mapping {@literal hashed m_duureayn Lnet/minecraft/unmapped/C_mztoqymb;m_duureayn()Lnet/minecraft/unmapped/C_mztoqymb$C_gcdvmpek;}
     * @mapping {@literal named m_duureayn Lnet/minecraft/block/entity/SculkCatalystBlockEntity;m_duureayn()Lnet/minecraft/block/entity/SculkCatalystBlockEntity$CatalystListener;}
     */
    public SculkCatalystBlockEntity.CatalystListener m_duureayn() {
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2023-12-29 00:18:04.093491727 +0000
+++ namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2023-12-29 00:17:00.437997633 +0000
@@ -52,10 +52,11 @@
    private int lastVibrationFrequency;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pqjuvriw;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/SculkSensorBlockEntity;<init>(Lnet/minecraft/block/entity/BlockEntityType;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   protected SculkSensorBlockEntity(BlockEntityType<?> arg, BlockPos arg2, BlockState arg3) {
-      super(arg, arg2, arg3);
+   protected SculkSensorBlockEntity(BlockEntityType<?> arg, BlockPos pos, BlockState state) {
+      super(arg, pos, state);
       this.vibrationData = new VibrationManager.Data();
       this.listener = new VibrationManager.Listener(this);
    }
@@ -134,7 +135,7 @@
    }
 
    /**
-    * @mapping {@literal hashed m_glymjlsc Lnet/minecraft/unmapped/C_pqjuvriw;m_glymjlsc()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
+    * @mapping {@literal hashed m_duureayn Lnet/minecraft/unmapped/C_pqjuvriw;m_duureayn()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
     * @mapping {@literal named m_duureayn Lnet/minecraft/block/entity/SculkSensorBlockEntity;m_duureayn()Lnet/minecraft/world/event/vibration/VibrationManager$Listener;}
     */
    public VibrationManager.Listener m_duureayn() {
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2023-12-29 00:18:04.089491759 +0000
+++ namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2023-12-29 00:17:00.429997696 +0000
@@ -289,7 +289,7 @@
    }
 
    /**
-    * @mapping {@literal hashed m_lbmdczem Lnet/minecraft/unmapped/C_pnalulqo;m_lbmdczem()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
+    * @mapping {@literal hashed m_duureayn Lnet/minecraft/unmapped/C_pnalulqo;m_duureayn()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
     * @mapping {@literal named m_duureayn Lnet/minecraft/block/entity/SculkShriekerBlockEntity;m_duureayn()Lnet/minecraft/world/event/vibration/VibrationManager$Listener;}
     */
    public VibrationManager.Listener m_duureayn() {
diff -bur namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2023-12-29 00:18:04.021492298 +0000
+++ namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2023-12-29 00:17:00.325998522 +0000
@@ -354,7 +354,7 @@
     * Mapping not found
     */
    @Override
-   public int[] getAvailableSlots(Direction side) {
+   public int[] getAvailableSlots(Direction direction) {
       return AVAILABLE_SLOTS;
    }
 
@@ -362,7 +362,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) {
+   public boolean canInsert(int slot, ItemStack stack, @Nullable Direction direction) {
       return !(Block.getBlockFromItem(stack.getItem()) instanceof ShulkerBoxBlock);
    }
 
@@ -370,7 +370,7 @@
     * Mapping not found
     */
    @Override
-   public boolean canExtract(int slot, ItemStack stack, Direction dir) {
+   public boolean canExtract(int slot, ItemStack stack, Direction direction) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java namedSrc/net/minecraft/block/entity/SignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java	2023-12-29 00:18:04.121491504 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2023-12-29 00:17:00.473997346 +0000
@@ -81,10 +81,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_axouvzlg;<init>(Lnet/minecraft/unmapped/C_wgqvodus;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/SignBlockEntity;<init>(Lnet/minecraft/block/entity/BlockEntityType;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   public SignBlockEntity(BlockEntityType arg, BlockPos arg2, BlockState arg3) {
-      super(arg, arg2, arg3);
+   public SignBlockEntity(BlockEntityType arg, BlockPos pos, BlockState state) {
+      super(arg, pos, state);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java namedSrc/net/minecraft/block/entity/SkullBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java	2023-12-29 00:18:04.117491536 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2023-12-29 00:17:00.469997378 +0000
@@ -106,7 +106,7 @@
          .build(
             new CacheLoader<String, CompletableFuture<Optional<GameProfile>>>() {
                /**
-                * @mapping {@literal hashed m_habmxdti Lnet/minecraft/unmapped/C_vrhaavsg$C_unbpgcsa;m_habmxdti(Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;}
+                * @mapping {@literal hashed load Lnet/minecraft/unmapped/C_vrhaavsg$C_unbpgcsa;load(Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;}
                 * @mapping {@literal named load Lnet/minecraft/block/entity/SkullBlockEntity$C_unbpgcsa;load(Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;}
                 */
                public CompletableFuture<Optional<GameProfile>> load(String string) {
diff -bur namedTargetSrc/net/minecraft/block/entity/SmokerBlockEntity.java namedSrc/net/minecraft/block/entity/SmokerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SmokerBlockEntity.java	2023-12-29 00:18:03.969492711 +0000
+++ namedSrc/net/minecraft/block/entity/SmokerBlockEntity.java	2023-12-29 00:17:00.245999158 +0000
@@ -34,8 +34,8 @@
     * Mapping not found
     */
    @Override
-   protected int getFuelTime(ItemStack fuel) {
-      return super.getFuelTime(fuel) / 2;
+   protected int getFuelTime(ItemStack stack) {
+      return super.getFuelTime(stack) / 2;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java namedSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java	2023-12-29 00:18:04.005492425 +0000
+++ namedSrc/net/minecraft/block/entity/TrappedChestBlockEntity.java	2023-12-29 00:17:00.301998713 +0000
@@ -11,10 +11,11 @@
  */
 public class TrappedChestBlockEntity extends ChestBlockEntity {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bsidvvmo;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/entity/TrappedChestBlockEntity;<init>(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V}
     */
-   public TrappedChestBlockEntity(BlockPos arg, BlockState arg2) {
-      super(BlockEntityType.TRAPPED_CHEST, arg, arg2);
+   public TrappedChestBlockEntity(BlockPos pos, BlockState state) {
+      super(BlockEntityType.TRAPPED_CHEST, pos, state);
    }
 
    /**

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/block/FungusBlock.java namedSrc/net/minecraft/block/FungusBlock.java
--- namedTargetSrc/net/minecraft/block/FungusBlock.java	2023-12-29 00:18:04.109491600 +0000
+++ namedSrc/net/minecraft/block/FungusBlock.java	2023-12-29 00:17:00.457997474 +0000
@@ -84,8 +84,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isIn(BlockTags.NYLIUM) || floor.isOf(Blocks.MYCELIUM) || floor.isOf(Blocks.SOUL_SOIL) || super.canPlantOnTop(floor, world, pos);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isIn(BlockTags.NYLIUM) || state.isOf(Blocks.MYCELIUM) || state.isOf(Blocks.SOUL_SOIL) || super.canPlantOnTop(state, world, pos);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/HopperBlock.java namedSrc/net/minecraft/block/HopperBlock.java
--- namedTargetSrc/net/minecraft/block/HopperBlock.java	2023-12-29 00:18:04.101491663 +0000
+++ namedSrc/net/minecraft/block/HopperBlock.java	2023-12-29 00:17:00.449997537 +0000
@@ -210,11 +210,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof HopperBlockEntity) {
-            ((HopperBlockEntity)lv).setCustomName(itemStack.getName());
+            ((HopperBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/JukeboxBlock.java namedSrc/net/minecraft/block/JukeboxBlock.java
--- namedTargetSrc/net/minecraft/block/JukeboxBlock.java	2023-12-29 00:18:03.969492711 +0000
+++ namedSrc/net/minecraft/block/JukeboxBlock.java	2023-12-29 00:17:00.241999190 +0000
@@ -58,9 +58,9 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      super.onPlaced(world, pos, state, placer, itemStack);
-      NbtCompound lv = BlockItem.getBlockEntityNbtFromStack(itemStack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      super.onPlaced(world, pos, state, placer, stack);
+      NbtCompound lv = BlockItem.getBlockEntityNbtFromStack(stack);
       if (lv != null && lv.contains("RecordItem")) {
          world.setBlockState(pos, state.with(HAS_RECORD, Boolean.valueOf(true)), Block.NOTIFY_LISTENERS);
       }
diff -bur namedTargetSrc/net/minecraft/block/KelpBlock.java namedSrc/net/minecraft/block/KelpBlock.java
--- namedTargetSrc/net/minecraft/block/KelpBlock.java	2023-12-29 00:18:03.925493061 +0000
+++ namedSrc/net/minecraft/block/KelpBlock.java	2023-12-29 00:17:00.173999730 +0000
@@ -86,7 +86,7 @@
     * Mapping not found
     */
    @Override
-   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
+   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/KelpPlantBlock.java namedSrc/net/minecraft/block/KelpPlantBlock.java
--- namedTargetSrc/net/minecraft/block/KelpPlantBlock.java	2023-12-29 00:18:04.129491441 +0000
+++ namedSrc/net/minecraft/block/KelpPlantBlock.java	2023-12-29 00:17:00.493997188 +0000
@@ -73,7 +73,7 @@
     * Mapping not found
     */
    @Override
-   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
+   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/LichenSpreadBehavior.java namedSrc/net/minecraft/block/LichenSpreadBehavior.java
--- namedTargetSrc/net/minecraft/block/LichenSpreadBehavior.java	2023-12-29 00:18:04.005492425 +0000
+++ namedSrc/net/minecraft/block/LichenSpreadBehavior.java	2023-12-29 00:17:00.297998745 +0000
@@ -172,8 +172,8 @@
        */
       @Nullable
       @Override
-      public BlockState getPlacementState(BlockState state, BlockView view, BlockPos pos, Direction dir) {
-         return this.block.withDirection(state, view, pos, dir);
+      public BlockState getPlacementState(BlockState state, BlockView world, BlockPos pos, Direction direction) {
+         return this.block.withDirection(state, world, pos, direction);
       }
 
       /**
@@ -188,9 +188,9 @@
        * Mapping not found
        */
       @Override
-      public boolean canSpreadTo(BlockView view, BlockPos pos, LichenSpreadBehavior.Placement placement) {
-         BlockState lv = view.getBlockState(placement.pos());
-         return this.canPlace(view, pos, placement.pos(), placement.face(), lv) && this.block.canPlace(view, lv, placement.pos(), placement.face());
+      public boolean canSpreadTo(BlockView world, BlockPos pos, LichenSpreadBehavior.Placement placement) {
+         BlockState lv = world.getBlockState(placement.pos());
+         return this.canPlace(world, pos, placement.pos(), placement.face(), lv) && this.block.canPlace(world, lv, placement.pos(), placement.face());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/LilyPadBlock.java namedSrc/net/minecraft/block/LilyPadBlock.java
--- namedTargetSrc/net/minecraft/block/LilyPadBlock.java	2023-12-29 00:18:04.049492076 +0000
+++ namedSrc/net/minecraft/block/LilyPadBlock.java	2023-12-29 00:17:00.365998205 +0000
@@ -64,9 +64,9 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
       FluidState lv = world.getFluidState(pos);
       FluidState lv2 = world.getFluidState(pos.up());
-      return (lv.getFluid() == Fluids.WATER || floor.getBlock() instanceof IceBlock) && lv2.getFluid() == Fluids.EMPTY;
+      return (lv.getFluid() == Fluids.WATER || state.getBlock() instanceof IceBlock) && lv2.getFluid() == Fluids.EMPTY;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java namedSrc/net/minecraft/block/MangrovePropaguleBlock.java
--- namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-12-29 00:18:03.937492966 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2023-12-29 00:17:00.189999603 +0000
@@ -74,11 +74,10 @@
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_txfkypkg;<init>(Lnet/minecraft/unmapped/C_hupbiznx;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/MangrovePropaguleBlock;<init>(Lnet/minecraft/block/WoodTypes;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * Mapping not found
     */
-   public MangrovePropaguleBlock(WoodTypes generator, AbstractBlock.Settings arg2) {
-      super(generator, arg2);
+   public MangrovePropaguleBlock(WoodTypes arg, AbstractBlock.Settings arg2) {
+      super(arg, arg2);
       this.setDefaultState(
          this.stateManager
             .getDefaultState()
@@ -101,8 +100,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return super.canPlantOnTop(floor, world, pos) || floor.isOf(Blocks.CLAY);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return super.canPlantOnTop(state, world, pos) || state.isOf(Blocks.CLAY);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java namedSrc/net/minecraft/block/MushroomPlantBlock.java
--- namedTargetSrc/net/minecraft/block/MushroomPlantBlock.java	2023-12-29 00:18:04.009492394 +0000
+++ namedSrc/net/minecraft/block/MushroomPlantBlock.java	2023-12-29 00:17:00.305998681 +0000
@@ -106,8 +106,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isOpaqueFullCube(world, pos);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isOpaqueFullCube(world, pos);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/NetherWartBlock.java namedSrc/net/minecraft/block/NetherWartBlock.java
--- namedTargetSrc/net/minecraft/block/NetherWartBlock.java	2023-12-29 00:18:04.069491917 +0000
+++ namedSrc/net/minecraft/block/NetherWartBlock.java	2023-12-29 00:17:00.397997951 +0000
@@ -71,8 +71,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isOf(Blocks.SOUL_SAND);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isOf(Blocks.SOUL_SAND);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/pattern/BlockPattern.java namedSrc/net/minecraft/block/pattern/BlockPattern.java
--- namedTargetSrc/net/minecraft/block/pattern/BlockPattern.java	2023-12-29 00:18:03.925493061 +0000
+++ namedSrc/net/minecraft/block/pattern/BlockPattern.java	2023-12-29 00:17:00.173999730 +0000
@@ -199,11 +199,11 @@
       }
 
       /**
-       * @mapping {@literal hashed m_mswfjvrx Lnet/minecraft/unmapped/C_cgooxnaq$C_xuzqyflr;m_mswfjvrx(Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_gogfiawf;}
+       * @mapping {@literal hashed load Lnet/minecraft/unmapped/C_cgooxnaq$C_xuzqyflr;load(Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_gogfiawf;}
        * @mapping {@literal named load Lnet/minecraft/block/pattern/BlockPattern$BlockStateCacheLoader;load(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/pattern/CachedBlockPosition;}
        */
-      public CachedBlockPosition load(BlockPos arg) {
-         return new CachedBlockPosition(this.world, arg, this.forceLoad);
+      public CachedBlockPosition load(BlockPos pos) {
+         return new CachedBlockPosition(this.world, pos, this.forceLoad);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/piston/PistonBlock.java namedSrc/net/minecraft/block/piston/PistonBlock.java
--- namedTargetSrc/net/minecraft/block/piston/PistonBlock.java	2023-12-29 00:18:03.989492553 +0000
+++ namedSrc/net/minecraft/block/piston/PistonBlock.java	2023-12-29 00:17:00.273998936 +0000
@@ -159,7 +159,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
       if (!world.isClient) {
          this.tryMove(world, pos, state);
       }
diff -bur namedTargetSrc/net/minecraft/block/PitcherCropBlock.java namedSrc/net/minecraft/block/PitcherCropBlock.java
--- namedTargetSrc/net/minecraft/block/PitcherCropBlock.java	2023-12-29 00:18:04.085491790 +0000
+++ namedSrc/net/minecraft/block/PitcherCropBlock.java	2023-12-29 00:17:00.425997728 +0000
@@ -160,8 +160,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isOf(Blocks.FARMLAND);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isOf(Blocks.FARMLAND);
    }
 
    /**
@@ -197,7 +197,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/PlayerSkullBlock.java namedSrc/net/minecraft/block/PlayerSkullBlock.java
--- namedTargetSrc/net/minecraft/block/PlayerSkullBlock.java	2023-12-29 00:18:04.041492140 +0000
+++ namedSrc/net/minecraft/block/PlayerSkullBlock.java	2023-12-29 00:17:00.357998268 +0000
@@ -43,13 +43,13 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      super.onPlaced(world, pos, state, placer, itemStack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      super.onPlaced(world, pos, state, placer, stack);
       BlockEntity lv = world.getBlockEntity(pos);
       if (lv instanceof SkullBlockEntity lv2) {
          GameProfile gameProfile = null;
-         if (itemStack.hasNbt()) {
-            NbtCompound lv3 = itemStack.getNbt();
+         if (stack.hasNbt()) {
+            NbtCompound lv3 = stack.getNbt();
             if (lv3.contains("SkullOwner", NbtElement.COMPOUND_TYPE)) {
                gameProfile = NbtHelper.toGameProfile(lv3.getCompound("SkullOwner"));
             } else if (lv3.contains("SkullOwner", NbtElement.STRING_TYPE) && !Util.isBlank(lv3.getString("SkullOwner"))) {
diff -bur namedTargetSrc/net/minecraft/block/PoweredRailBlock.java namedSrc/net/minecraft/block/PoweredRailBlock.java
--- namedTargetSrc/net/minecraft/block/PoweredRailBlock.java	2023-12-29 00:18:04.001492457 +0000
+++ namedSrc/net/minecraft/block/PoweredRailBlock.java	2023-12-29 00:17:00.293998777 +0000
@@ -161,7 +161,7 @@
     * Mapping not found
     */
    @Override
-   protected void updateBlockState(BlockState state, World world, BlockPos pos, Block neighbor) {
+   protected void updateBlockState(BlockState state, World world, BlockPos pos, Block block) {
       boolean bl = state.get(POWERED);
       boolean bl2 = world.isReceivingRedstonePower(pos)
          || this.isPoweredByOtherRails(world, pos, state, true, 0)
diff -bur namedTargetSrc/net/minecraft/block/RailBlock.java namedSrc/net/minecraft/block/RailBlock.java
--- namedTargetSrc/net/minecraft/block/RailBlock.java	2023-12-29 00:18:04.081491822 +0000
+++ namedSrc/net/minecraft/block/RailBlock.java	2023-12-29 00:17:00.417997791 +0000
@@ -46,8 +46,8 @@
     * Mapping not found
     */
    @Override
-   protected void updateBlockState(BlockState state, World world, BlockPos pos, Block neighbor) {
-      if (neighbor.getDefaultState().isRedstonePowerSource() && new RailPlacementHelper(world, pos, state).getNeighborCount() == 3) {
+   protected void updateBlockState(BlockState state, World world, BlockPos pos, Block block) {
+      if (block.getDefaultState().isRedstonePowerSource() && new RailPlacementHelper(world, pos, state).getNeighborCount() == 3) {
          this.updateBlockState(world, pos, state, false);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/RedstoneDiodeBlock.java namedSrc/net/minecraft/block/RedstoneDiodeBlock.java
--- namedTargetSrc/net/minecraft/block/RedstoneDiodeBlock.java	2023-12-29 00:18:03.945492902 +0000
+++ namedSrc/net/minecraft/block/RedstoneDiodeBlock.java	2023-12-29 00:17:00.205999477 +0000
@@ -214,7 +214,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
       if (this.shouldBePowered(world, pos, state)) {
          world.scheduleBlockTick(pos, this, 1);
       }
diff -bur namedTargetSrc/net/minecraft/block/RootsBlock.java namedSrc/net/minecraft/block/RootsBlock.java
--- namedTargetSrc/net/minecraft/block/RootsBlock.java	2023-12-29 00:18:04.089491759 +0000
+++ namedSrc/net/minecraft/block/RootsBlock.java	2023-12-29 00:17:00.429997696 +0000
@@ -53,7 +53,7 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isIn(BlockTags.NYLIUM) || floor.isOf(Blocks.SOUL_SOIL) || super.canPlantOnTop(floor, world, pos);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isIn(BlockTags.NYLIUM) || state.isOf(Blocks.SOUL_SOIL) || super.canPlantOnTop(state, world, pos);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/RotatedInfestedBlock.java namedSrc/net/minecraft/block/RotatedInfestedBlock.java
--- namedTargetSrc/net/minecraft/block/RotatedInfestedBlock.java	2023-12-29 00:18:04.065491949 +0000
+++ namedSrc/net/minecraft/block/RotatedInfestedBlock.java	2023-12-29 00:17:00.393997982 +0000
@@ -30,10 +30,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rwdojorq;<init>(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/RotatedInfestedBlock;<init>(Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public RotatedInfestedBlock(Block arg, AbstractBlock.Settings arg2) {
-      super(arg, arg2);
+   public RotatedInfestedBlock(Block block, AbstractBlock.Settings arg2) {
+      super(block, arg2);
       this.setDefaultState(this.getDefaultState().with(PillarBlock.AXIS, Direction.Axis.Y));
    }
 
diff -bur namedTargetSrc/net/minecraft/block/sculk/SculkVeinBlock.java namedSrc/net/minecraft/block/sculk/SculkVeinBlock.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkVeinBlock.java	2023-12-29 00:18:04.033492203 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkVeinBlock.java	2023-12-29 00:17:00.345998364 +0000
@@ -272,12 +272,12 @@
        * Mapping not found
        */
       @Override
-      public boolean canPlace(BlockView view, BlockPos posA, BlockPos posB, Direction dir, BlockState state) {
-         BlockState lv = view.getBlockState(posB.offset(dir));
+      public boolean canPlace(BlockView world, BlockPos posA, BlockPos posB, Direction direction, BlockState state) {
+         BlockState lv = world.getBlockState(posB.offset(direction));
          if (!lv.isOf(Blocks.SCULK) && !lv.isOf(Blocks.SCULK_CATALYST) && !lv.isOf(Blocks.MOVING_PISTON)) {
             if (posA.getManhattanDistance(posB) == 2) {
-               BlockPos lv2 = posA.offset(dir.getOpposite());
-               if (view.getBlockState(lv2).isSideSolidFullSquare(view, lv2, dir)) {
+               BlockPos lv2 = posA.offset(direction.getOpposite());
+               if (world.getBlockState(lv2).isSideSolidFullSquare(world, lv2, direction)) {
                   return false;
                }
             }
@@ -288,7 +288,7 @@
             } else if (state.isIn(BlockTags.FIRE)) {
                return false;
             } else {
-               return state.materialReplaceable() || super.canPlace(view, posA, posB, dir, state);
+               return state.materialReplaceable() || super.canPlace(world, posA, posB, direction, state);
             }
          } else {
             return false;
diff -bur namedTargetSrc/net/minecraft/block/SeagrassBlock.java namedSrc/net/minecraft/block/SeagrassBlock.java
--- namedTargetSrc/net/minecraft/block/SeagrassBlock.java	2023-12-29 00:18:03.985492584 +0000
+++ namedSrc/net/minecraft/block/SeagrassBlock.java	2023-12-29 00:17:00.269998968 +0000
@@ -66,8 +66,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isSideSolidFullSquare(world, pos, Direction.UP) && !floor.isOf(Blocks.MAGMA_BLOCK);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isSideSolidFullSquare(world, pos, Direction.UP) && !state.isOf(Blocks.MAGMA_BLOCK);
    }
 
    /**
@@ -145,7 +145,7 @@
     * Mapping not found
     */
    @Override
-   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
+   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/SeaPickleBlock.java namedSrc/net/minecraft/block/SeaPickleBlock.java
--- namedTargetSrc/net/minecraft/block/SeaPickleBlock.java	2023-12-29 00:18:03.993492520 +0000
+++ namedSrc/net/minecraft/block/SeaPickleBlock.java	2023-12-29 00:17:00.281998872 +0000
@@ -110,8 +110,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return !floor.getCollisionShape(world, pos).getFace(Direction.UP).isEmpty() || floor.isSideSolidFullSquare(world, pos, Direction.UP);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return !state.getCollisionShape(world, pos).getFace(Direction.UP).isEmpty() || state.isSideSolidFullSquare(world, pos, Direction.UP);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2023-12-29 00:18:04.037492172 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2023-12-29 00:17:00.353998300 +0000
@@ -268,11 +268,11 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
-      if (itemStack.hasCustomName()) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+      if (stack.hasCustomName()) {
          BlockEntity lv = world.getBlockEntity(pos);
          if (lv instanceof ShulkerBoxBlockEntity) {
-            ((ShulkerBoxBlockEntity)lv).setCustomName(itemStack.getName());
+            ((ShulkerBoxBlockEntity)lv).setCustomName(stack.getName());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java namedSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java	2023-12-29 00:18:03.933492997 +0000
+++ namedSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java	2023-12-29 00:17:00.185999635 +0000
@@ -101,11 +101,10 @@
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_vsqrirpz;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/CeilingHangingSignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * Mapping not found
     */
-   public CeilingHangingSignBlock(SignType type, AbstractBlock.Settings arg2) {
-      super(type, arg2.sounds(type.hangingSignSoundType()));
+   public CeilingHangingSignBlock(SignType arg, AbstractBlock.Settings arg2) {
+      super(arg, arg2.sounds(arg.hangingSignSoundType()));
       this.setDefaultState(
          this.stateManager
             .getDefaultState()
diff -bur namedTargetSrc/net/minecraft/block/sign/SignBlock.java namedSrc/net/minecraft/block/sign/SignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/SignBlock.java	2023-12-29 00:18:03.949492870 +0000
+++ namedSrc/net/minecraft/block/sign/SignBlock.java	2023-12-29 00:17:00.213999413 +0000
@@ -46,11 +46,10 @@
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kkhuxlco;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/SignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * Mapping not found
     */
-   public SignBlock(SignType type, AbstractBlock.Settings arg2) {
-      super(type, arg2.sounds(type.soundType()));
+   public SignBlock(SignType arg, AbstractBlock.Settings arg2) {
+      super(arg, arg2.sounds(arg.soundType()));
       this.setDefaultState(this.stateManager.getDefaultState().with(ROTATION, Integer.valueOf(0)).with(WATERLOGGED, Boolean.valueOf(false)));
    }
 
diff -bur namedTargetSrc/net/minecraft/block/sign/WallHangingSignBlock.java namedSrc/net/minecraft/block/sign/WallHangingSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/WallHangingSignBlock.java	2023-12-29 00:18:04.037492172 +0000
+++ namedSrc/net/minecraft/block/sign/WallHangingSignBlock.java	2023-12-29 00:17:00.349998332 +0000
@@ -96,11 +96,10 @@
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hzvmpvoj;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/WallHangingSignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * Mapping not found
     */
-   public WallHangingSignBlock(SignType type, AbstractBlock.Settings arg2) {
-      super(type, arg2.sounds(type.hangingSignSoundType()));
+   public WallHangingSignBlock(SignType arg, AbstractBlock.Settings arg2) {
+      super(arg, arg2.sounds(arg.hangingSignSoundType()));
       this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(WATERLOGGED, Boolean.valueOf(false)));
    }
 
diff -bur namedTargetSrc/net/minecraft/block/sign/WallSignBlock.java namedSrc/net/minecraft/block/sign/WallSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/WallSignBlock.java	2023-12-29 00:18:03.965492743 +0000
+++ namedSrc/net/minecraft/block/sign/WallSignBlock.java	2023-12-29 00:17:00.237999222 +0000
@@ -85,11 +85,10 @@
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rgitojot;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/WallSignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * Mapping not found
     */
-   public WallSignBlock(SignType type, AbstractBlock.Settings arg2) {
-      super(type, arg2.sounds(type.soundType()));
+   public WallSignBlock(SignType arg, AbstractBlock.Settings arg2) {
+      super(arg, arg2.sounds(arg.soundType()));
       this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(WATERLOGGED, Boolean.valueOf(false)));
    }
 
diff -bur namedTargetSrc/net/minecraft/block/SlabBlock.java namedSrc/net/minecraft/block/SlabBlock.java
--- namedTargetSrc/net/minecraft/block/SlabBlock.java	2023-12-29 00:18:03.913493156 +0000
+++ namedSrc/net/minecraft/block/SlabBlock.java	2023-12-29 00:17:00.157999856 +0000
@@ -152,8 +152,8 @@
     * Mapping not found
     */
    @Override
-   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
-      return state.get(TYPE) != SlabType.DOUBLE ? Waterloggable.super.tryFillWithFluid(world, pos, state, fluidState) : false;
+   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
+      return blockState.get(TYPE) != SlabType.DOUBLE ? Waterloggable.super.tryFillWithFluid(world, pos, blockState, fluidState) : false;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/SmallDripleafBlock.java namedSrc/net/minecraft/block/SmallDripleafBlock.java
--- namedTargetSrc/net/minecraft/block/SmallDripleafBlock.java	2023-12-29 00:18:04.073491885 +0000
+++ namedSrc/net/minecraft/block/SmallDripleafBlock.java	2023-12-29 00:17:00.401997919 +0000
@@ -85,9 +85,9 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isIn(BlockTags.SMALL_DRIPLEAF_PLACEABLE)
-         || world.getFluidState(pos.up()).isEqualAndStill(Fluids.WATER) && super.canPlantOnTop(floor, world, pos);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isIn(BlockTags.SMALL_DRIPLEAF_PLACEABLE)
+         || world.getFluidState(pos.up()).isEqualAndStill(Fluids.WATER) && super.canPlantOnTop(state, world, pos);
    }
 
    /**
@@ -104,7 +104,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
       if (!world.isClient()) {
          BlockPos lv = pos.up();
          BlockState lv2 = TallPlantBlock.withWaterloggedState(
diff -bur namedTargetSrc/net/minecraft/block/SproutsBlock.java namedSrc/net/minecraft/block/SproutsBlock.java
--- namedTargetSrc/net/minecraft/block/SproutsBlock.java	2023-12-29 00:18:03.969492711 +0000
+++ namedSrc/net/minecraft/block/SproutsBlock.java	2023-12-29 00:17:00.241999190 +0000
@@ -48,7 +48,7 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isIn(BlockTags.NYLIUM) || floor.isOf(Blocks.SOUL_SOIL) || super.canPlantOnTop(floor, world, pos);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isIn(BlockTags.NYLIUM) || state.isOf(Blocks.SOUL_SOIL) || super.canPlantOnTop(state, world, pos);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/StainedGlassBlock.java namedSrc/net/minecraft/block/StainedGlassBlock.java
--- namedTargetSrc/net/minecraft/block/StainedGlassBlock.java	2023-12-29 00:18:04.105491631 +0000
+++ namedSrc/net/minecraft/block/StainedGlassBlock.java	2023-12-29 00:17:00.453997505 +0000
@@ -39,7 +39,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_prlkzxjh Lnet/minecraft/unmapped/C_tdbwswag;m_prlkzxjh()Lnet/minecraft/unmapped/C_arllgqae;}
+    * @mapping {@literal named getColor Lnet/minecraft/block/StainedGlassBlock;getColor()Lnet/minecraft/util/DyeColor;}
     */
    @Override
    public DyeColor getColor() {
diff -bur namedTargetSrc/net/minecraft/block/StainedGlassPaneBlock.java namedSrc/net/minecraft/block/StainedGlassPaneBlock.java
--- namedTargetSrc/net/minecraft/block/StainedGlassPaneBlock.java	2023-12-29 00:18:04.105491631 +0000
+++ namedSrc/net/minecraft/block/StainedGlassPaneBlock.java	2023-12-29 00:17:00.453997505 +0000
@@ -49,7 +49,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_prlkzxjh Lnet/minecraft/unmapped/C_krdronmr;m_prlkzxjh()Lnet/minecraft/unmapped/C_arllgqae;}
+    * @mapping {@literal named getColor Lnet/minecraft/block/StainedGlassPaneBlock;getColor()Lnet/minecraft/util/DyeColor;}
     */
    @Override
    public DyeColor getColor() {
diff -bur namedTargetSrc/net/minecraft/block/StemBlock.java namedSrc/net/minecraft/block/StemBlock.java
--- namedTargetSrc/net/minecraft/block/StemBlock.java	2023-12-29 00:18:04.065491949 +0000
+++ namedSrc/net/minecraft/block/StemBlock.java	2023-12-29 00:17:00.393997982 +0000
@@ -117,8 +117,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isOf(Blocks.FARMLAND);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isOf(Blocks.FARMLAND);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/StructureBlock.java namedSrc/net/minecraft/block/StructureBlock.java
--- namedTargetSrc/net/minecraft/block/StructureBlock.java	2023-12-29 00:18:03.981492616 +0000
+++ namedSrc/net/minecraft/block/StructureBlock.java	2023-12-29 00:17:00.261999032 +0000
@@ -73,7 +73,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
       if (!world.isClient) {
          if (placer != null) {
             BlockEntity lv = world.getBlockEntity(pos);
diff -bur namedTargetSrc/net/minecraft/block/TallPlantBlock.java namedSrc/net/minecraft/block/TallPlantBlock.java
--- namedTargetSrc/net/minecraft/block/TallPlantBlock.java	2023-12-29 00:18:03.977492648 +0000
+++ namedSrc/net/minecraft/block/TallPlantBlock.java	2023-12-29 00:17:00.257999063 +0000
@@ -85,7 +85,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
       BlockPos lv = pos.up();
       world.setBlockState(lv, withWaterloggedState(world, lv, this.getDefaultState().with(HALF, DoubleBlockHalf.UPPER)), Block.NOTIFY_ALL);
    }
diff -bur namedTargetSrc/net/minecraft/block/TallSeagrassBlock.java namedSrc/net/minecraft/block/TallSeagrassBlock.java
--- namedTargetSrc/net/minecraft/block/TallSeagrassBlock.java	2023-12-29 00:18:04.001492457 +0000
+++ namedSrc/net/minecraft/block/TallSeagrassBlock.java	2023-12-29 00:17:00.293998777 +0000
@@ -70,8 +70,8 @@
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return floor.isSideSolidFullSquare(world, pos, Direction.UP) && !floor.isOf(Blocks.MAGMA_BLOCK);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return state.isSideSolidFullSquare(world, pos, Direction.UP) && !state.isOf(Blocks.MAGMA_BLOCK);
    }
 
    /**
@@ -133,7 +133,7 @@
     * Mapping not found
     */
    @Override
-   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
+   public boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
       return false;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/TripwireHookBlock.java namedSrc/net/minecraft/block/TripwireHookBlock.java
--- namedTargetSrc/net/minecraft/block/TripwireHookBlock.java	2023-12-29 00:18:04.069491917 +0000
+++ namedSrc/net/minecraft/block/TripwireHookBlock.java	2023-12-29 00:17:00.401997919 +0000
@@ -178,7 +178,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) {
+   public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
       update(world, pos, state, false, false, -1, null);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/WallPlayerSkullBlock.java namedSrc/net/minecraft/block/WallPlayerSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WallPlayerSkullBlock.java	2023-12-29 00:18:04.129491441 +0000
+++ namedSrc/net/minecraft/block/WallPlayerSkullBlock.java	2023-12-29 00:17:00.493997188 +0000
@@ -38,8 +38,8 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      Blocks.PLAYER_HEAD.onPlaced(world, pos, state, placer, itemStack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      Blocks.PLAYER_HEAD.onPlaced(world, pos, state, placer, stack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/WallTorchBlock.java namedSrc/net/minecraft/block/WallTorchBlock.java
--- namedTargetSrc/net/minecraft/block/WallTorchBlock.java	2023-12-29 00:18:04.065491949 +0000
+++ namedSrc/net/minecraft/block/WallTorchBlock.java	2023-12-29 00:17:00.389998014 +0000
@@ -69,11 +69,10 @@
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pqbshjyj;<init>(Lnet/minecraft/unmapped/C_lwmufxcy;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/WallTorchBlock;<init>(Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * Mapping not found
     */
-   protected WallTorchBlock(DefaultParticleType particle, AbstractBlock.Settings arg2) {
-      super(particle, arg2);
+   protected WallTorchBlock(DefaultParticleType arg, AbstractBlock.Settings arg2) {
+      super(arg, arg2);
       this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH));
    }
 
diff -bur namedTargetSrc/net/minecraft/block/WallWitherSkullBlock.java namedSrc/net/minecraft/block/WallWitherSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WallWitherSkullBlock.java	2023-12-29 00:18:04.105491631 +0000
+++ namedSrc/net/minecraft/block/WallWitherSkullBlock.java	2023-12-29 00:17:00.449997537 +0000
@@ -36,7 +36,7 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      Blocks.WITHER_SKELETON_SKULL.onPlaced(world, pos, state, placer, itemStack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      Blocks.WITHER_SKELETON_SKULL.onPlaced(world, pos, state, placer, stack);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/Waterloggable.java namedSrc/net/minecraft/block/Waterloggable.java
--- namedTargetSrc/net/minecraft/block/Waterloggable.java	2023-12-29 00:18:03.945492902 +0000
+++ namedSrc/net/minecraft/block/Waterloggable.java	2023-12-29 00:17:00.201999508 +0000
@@ -31,10 +31,10 @@
     * Mapping not found
     */
    @Override
-   default boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState state, FluidState fluidState) {
-      if (!state.get(Properties.WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) {
+   default boolean tryFillWithFluid(WorldAccess world, BlockPos pos, BlockState blockState, FluidState fluidState) {
+      if (!blockState.get(Properties.WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) {
          if (!world.isClient()) {
-            world.setBlockState(pos, state.with(Properties.WATERLOGGED, Boolean.valueOf(true)), Block.NOTIFY_ALL);
+            world.setBlockState(pos, blockState.with(Properties.WATERLOGGED, Boolean.valueOf(true)), Block.NOTIFY_ALL);
             world.scheduleFluidTick(pos, fluidState.getFluid(), fluidState.getFluid().getTickRate(world));
          }
 
diff -bur namedTargetSrc/net/minecraft/block/WitherRoseBlock.java namedSrc/net/minecraft/block/WitherRoseBlock.java
--- namedTargetSrc/net/minecraft/block/WitherRoseBlock.java	2023-12-29 00:18:04.009492394 +0000
+++ namedSrc/net/minecraft/block/WitherRoseBlock.java	2023-12-29 00:17:00.305998681 +0000
@@ -47,19 +47,18 @@
    }
 
    /**
-    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gigziqfv;<init>(Ljava/util/List;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/WitherRoseBlock;<init>(Ljava/util/List;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * Mapping not found
     */
-   public WitherRoseBlock(List<SuspiciousStewEffectContainer.Effect> suspiciousStewEffects, AbstractBlock.Settings arg) {
-      super(suspiciousStewEffects, arg);
+   public WitherRoseBlock(List<SuspiciousStewEffectContainer.Effect> list, AbstractBlock.Settings arg) {
+      super(list, arg);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
-      return super.canPlantOnTop(floor, world, pos) || floor.isOf(Blocks.NETHERRACK) || floor.isOf(Blocks.SOUL_SAND) || floor.isOf(Blocks.SOUL_SOIL);
+   protected boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) {
+      return super.canPlantOnTop(state, world, pos) || state.isOf(Blocks.NETHERRACK) || state.isOf(Blocks.SOUL_SAND) || state.isOf(Blocks.SOUL_SOIL);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/WitherSkullBlock.java namedSrc/net/minecraft/block/WitherSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WitherSkullBlock.java	2023-12-29 00:18:04.105491631 +0000
+++ namedSrc/net/minecraft/block/WitherSkullBlock.java	2023-12-29 00:17:00.453997505 +0000
@@ -62,8 +62,8 @@
     * Mapping not found
     */
    @Override
-   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {
-      super.onPlaced(world, pos, state, placer, itemStack);
+   public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
+      super.onPlaced(world, pos, state, placer, stack);
       BlockEntity lv = world.getBlockEntity(pos);
       if (lv instanceof SkullBlockEntity) {
          onPlaced(world, pos, (SkullBlockEntity)lv);
diff -bur namedTargetSrc/net/minecraft/client/font/FontManager.java namedSrc/net/minecraft/client/font/FontManager.java
--- namedTargetSrc/net/minecraft/client/font/FontManager.java	2023-12-29 00:18:04.069491917 +0000
+++ namedSrc/net/minecraft/client/font/FontManager.java	2023-12-29 00:17:00.397997951 +0000
@@ -119,7 +119,7 @@
    @Override
    public CompletableFuture<Void> reload(
       ResourceReloader.Synchronizer synchronizer,
-      ResourceManager manager,
+      ResourceManager resourceManager,
       Profiler prepareProfiler,
       Profiler applyProfiler,
       Executor prepareExecutor,
@@ -127,7 +127,7 @@
    ) {
       prepareProfiler.startTick();
       prepareProfiler.endTick();
-      return this.prepare(manager, prepareExecutor)
+      return this.prepare(resourceManager, prepareExecutor)
          .thenCompose(synchronizer::whenPrepared)
          .thenAcceptAsync(preparation -> this.reload(preparation, applyProfiler), applyExecutor);
    }
diff -bur namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java
--- namedTargetSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2023-12-29 00:18:03.969492711 +0000
+++ namedSrc/net/minecraft/client/font/GlyphAtlasTexture.java	2023-12-29 00:17:00.245999158 +0000
@@ -54,7 +54,7 @@
     * Mapping not found
     */
    @Override
-   public void load(ResourceManager manager) {
+   public void load(ResourceManager resourceManager) {
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/ElementPath.java namedSrc/net/minecraft/client/gui/ElementPath.java
--- namedTargetSrc/net/minecraft/client/gui/ElementPath.java	2023-12-29 00:18:04.101491663 +0000
+++ namedSrc/net/minecraft/client/gui/ElementPath.java	2023-12-29 00:17:00.449997537 +0000
@@ -66,14 +66,6 @@
       public void setFocused(boolean focused) {
          this.component.setFocused(focused);
       }
-
-      /**
-       * Mapping not found
-       */
-      @Override
-      public Element getElement() {
-         return this.component;
-      }
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java namedSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java	2023-12-29 00:18:04.053492044 +0000
+++ namedSrc/net/minecraft/client/gui/hud/boss_bar/BossBarHud.java	2023-12-29 00:17:00.373998141 +0000
@@ -189,8 +189,8 @@
              * Mapping not found
              */
             @Override
-            public void updateStyle(UUID id, BossBar.Color color, BossBar.Style style) {
-               ClientBossBar lv = (ClientBossBar)BossBarHud.this.bossBars.get(id);
+            public void updateStyle(UUID uuid, BossBar.Color color, BossBar.Style style) {
+               ClientBossBar lv = (ClientBossBar)BossBarHud.this.bossBars.get(uuid);
                lv.setColor(color);
                lv.setStyle(style);
             }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/narration/ScreenNarrator.java namedSrc/net/minecraft/client/gui/screen/narration/ScreenNarrator.java
--- namedTargetSrc/net/minecraft/client/gui/screen/narration/ScreenNarrator.java	2023-12-29 00:18:03.977492648 +0000
+++ namedSrc/net/minecraft/client/gui/screen/narration/ScreenNarrator.java	2023-12-29 00:17:00.253999095 +0000
@@ -49,7 +49,7 @@
          private boolean first = true;
 
          /**
-          * @mapping {@literal hashed m_asmdkrhe Lnet/minecraft/unmapped/C_yviluxux$C_elhhqgnj;m_asmdkrhe(Ljava/lang/String;)V}
+          * @mapping {@literal hashed accept Lnet/minecraft/unmapped/C_yviluxux$C_elhhqgnj;accept(Ljava/lang/String;)V}
           * @mapping {@literal named accept Lnet/minecraft/client/gui/screen/narration/ScreenNarrator$C_elhhqgnj;accept(Ljava/lang/String;)V}
           */
          public void accept(String string) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/StatsScreen.java namedSrc/net/minecraft/client/gui/screen/StatsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-12-29 00:18:04.129491441 +0000
+++ namedSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-12-29 00:17:00.493997188 +0000
@@ -828,7 +828,7 @@
       @Environment(EnvType.CLIENT)
       class ItemComparator implements Comparator<StatsScreen.ItemStatEntryListWidget.Entry> {
          /**
-          * @mapping {@literal hashed m_umnpmtbn Lnet/minecraft/unmapped/C_ctfuumpt$C_bkvrdjel$C_yzwyeres;m_umnpmtbn(Lnet/minecraft/unmapped/C_ctfuumpt$C_bkvrdjel$C_ywcpbpqz;Lnet/minecraft/unmapped/C_ctfuumpt$C_bkvrdjel$C_ywcpbpqz;)I}
+          * @mapping {@literal hashed compare Lnet/minecraft/unmapped/C_ctfuumpt$C_bkvrdjel$C_yzwyeres;compare(Lnet/minecraft/unmapped/C_ctfuumpt$C_bkvrdjel$C_ywcpbpqz;Lnet/minecraft/unmapped/C_ctfuumpt$C_bkvrdjel$C_ywcpbpqz;)I}
           * @mapping {@literal named compare Lnet/minecraft/client/gui/screen/StatsScreen$ItemStatEntryListWidget$ItemComparator;compare(Lnet/minecraft/client/gui/screen/StatsScreen$ItemStatEntryListWidget$Entry;Lnet/minecraft/client/gui/screen/StatsScreen$ItemStatEntryListWidget$Entry;)I}
           */
          public int compare(StatsScreen.ItemStatEntryListWidget.Entry arg, StatsScreen.ItemStatEntryListWidget.Entry arg2) {
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java namedSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java	2023-12-29 00:18:04.109491600 +0000
+++ namedSrc/net/minecraft/client/gui/widget/button/SpriteButtonWidget.java	2023-12-29 00:17:00.457997474 +0000
@@ -163,11 +163,10 @@
    @Environment(EnvType.CLIENT)
    public static class SpriteMessageButtonWidget extends SpriteButtonWidget {
       /**
-       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ckkrwxej$C_nvfipkoh;<init>(IILnet/minecraft/unmapped/C_rdaqiwdt;IILnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_buwziidm$C_zlxjklbn;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/SpriteButtonWidget$SpriteMessageButtonWidget;<init>(IILnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;)V}
+       * Mapping not found
        */
-      protected SpriteMessageButtonWidget(int i, int j, Text arg, int k, int l, Identifier texture, ButtonWidget.PressAction arg3) {
-         super(i, j, arg, k, l, texture, arg3);
+      protected SpriteMessageButtonWidget(int i, int j, Text arg, int k, int l, Identifier arg2, ButtonWidget.PressAction arg3) {
+         super(i, j, arg, k, l, arg2, arg3);
       }
 
       /**
@@ -185,11 +184,11 @@
        * Mapping not found
        */
       @Override
-      public void drawScrollableText(GuiGraphics graphics, TextRenderer renderer, int color) {
+      public void drawScrollableText(GuiGraphics graphics, TextRenderer textRenderer, int color) {
          int j = this.getX() + 2;
          int k = this.getX() + this.getWidth() - this.textureWidth - 4;
          int l = this.getX() + this.getWidth() / 2;
-         drawScrollingText(graphics, renderer, this.getMessage(), l, j, this.getY(), k, this.getY() + this.getHeight(), color);
+         drawScrollingText(graphics, textRenderer, this.getMessage(), l, j, this.getY(), k, this.getY() + this.getHeight(), color);
       }
    }
 
@@ -200,11 +199,10 @@
    @Environment(EnvType.CLIENT)
    public static class SpriteOnlyButtonWidget extends SpriteButtonWidget {
       /**
-       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ckkrwxej$C_dqzfmcqd;<init>(IILnet/minecraft/unmapped/C_rdaqiwdt;IILnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_buwziidm$C_zlxjklbn;)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/button/SpriteButtonWidget$SpriteOnlyButtonWidget;<init>(IILnet/minecraft/text/Text;IILnet/minecraft/util/Identifier;Lnet/minecraft/client/gui/widget/button/ButtonWidget$PressAction;)V}
+       * Mapping not found
        */
-      protected SpriteOnlyButtonWidget(int i, int j, Text arg, int k, int l, Identifier texture, ButtonWidget.PressAction arg3) {
-         super(i, j, arg, k, l, texture, arg3);
+      protected SpriteOnlyButtonWidget(int i, int j, Text arg, int k, int l, Identifier arg2, ButtonWidget.PressAction arg3) {
+         super(i, j, arg, k, l, arg2, arg3);
       }
 
       /**
@@ -222,7 +220,7 @@
        * Mapping not found
        */
       @Override
-      public void drawScrollableText(GuiGraphics graphics, TextRenderer renderer, int color) {
+      public void drawScrollableText(GuiGraphics graphics, TextRenderer textRenderer, int color) {
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/AlwaysSelectedEntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/AlwaysSelectedEntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/AlwaysSelectedEntryListWidget.java	2023-12-29 00:18:04.029492235 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/AlwaysSelectedEntryListWidget.java	2023-12-29 00:17:00.333998459 +0000
@@ -27,8 +27,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zbixrgsf;<init>(Lnet/minecraft/unmapped/C_ayfeobid;IIII)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/list/AlwaysSelectedEntryListWidget;<init>(Lnet/minecraft/client/MinecraftClient;IIII)V}
     */
-   public AlwaysSelectedEntryListWidget(MinecraftClient client, int i, int j, int k, int itemHeight) {
-      super(client, i, j, k, itemHeight);
+   public AlwaysSelectedEntryListWidget(MinecraftClient client, int i, int j, int k, int l) {
+      super(client, i, j, k, l);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/ButtonListWidget.java namedSrc/net/minecraft/client/gui/widget/list/ButtonListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/ButtonListWidget.java	2023-12-29 00:18:04.077491853 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/ButtonListWidget.java	2023-12-29 00:17:00.409997855 +0000
@@ -26,8 +26,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pjaxgicy;<init>(Lnet/minecraft/unmapped/C_ayfeobid;IIII)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/list/ButtonListWidget;<init>(Lnet/minecraft/client/MinecraftClient;IIII)V}
     */
-   public ButtonListWidget(MinecraftClient client, int i, int j, int k, int itemHeight) {
-      super(client, i, j, k, itemHeight);
+   public ButtonListWidget(MinecraftClient client, int i, int j, int k, int l) {
+      super(client, i, j, k, l);
       this.centerListVertically = false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/ElementListWidget.java namedSrc/net/minecraft/client/gui/widget/list/ElementListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/ElementListWidget.java	2023-12-29 00:18:04.065491949 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/ElementListWidget.java	2023-12-29 00:17:00.393997982 +0000
@@ -28,8 +28,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mrtbaubu;<init>(Lnet/minecraft/unmapped/C_ayfeobid;IIII)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/list/ElementListWidget;<init>(Lnet/minecraft/client/MinecraftClient;IIII)V}
     */
-   public ElementListWidget(MinecraftClient client, int i, int j, int k, int itemHeight) {
-      super(client, i, j, k, itemHeight);
+   public ElementListWidget(MinecraftClient client, int i, int j, int k, int l) {
+      super(client, i, j, k, l);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-12-29 00:18:03.941492933 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-12-29 00:17:00.197999540 +0000
@@ -756,7 +756,7 @@
       private final List<E> entries = Lists.<E>newArrayList();
 
       /**
-       * @mapping {@literal hashed m_sricpmvk Lnet/minecraft/unmapped/C_nmdfcqgq$C_gvpiqisq;m_sricpmvk(I)Lnet/minecraft/unmapped/C_nmdfcqgq$C_rzayyeiy;}
+       * @mapping {@literal hashed get Lnet/minecraft/unmapped/C_nmdfcqgq$C_gvpiqisq;get(I)Lnet/minecraft/unmapped/C_nmdfcqgq$C_rzayyeiy;}
        * @mapping {@literal named get Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entries;get(I)Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;}
        */
       public E get(int i) {
@@ -782,7 +782,7 @@
       }
 
       /**
-       * @mapping {@literal hashed m_psoahgas Lnet/minecraft/unmapped/C_nmdfcqgq$C_gvpiqisq;m_psoahgas(ILnet/minecraft/unmapped/C_nmdfcqgq$C_rzayyeiy;)V}
+       * @mapping {@literal hashed add Lnet/minecraft/unmapped/C_nmdfcqgq$C_gvpiqisq;add(ILnet/minecraft/unmapped/C_nmdfcqgq$C_rzayyeiy;)V}
        * @mapping {@literal named add Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entries;add(ILnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;)V}
        */
       public void add(int i, E arg) {
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-12-29 00:18:04.001492457 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-12-29 00:17:00.297998745 +0000
@@ -450,11 +450,10 @@
    @Environment(EnvType.CLIENT)
    class FurnaceAlternativeButtonWidget extends RecipeAlternativesWidget.AlternativeButtonWidget {
       /**
-       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ngptzlri$C_saqnuqje;<init>(Lnet/minecraft/unmapped/C_ngptzlri;IILnet/minecraft/unmapped/C_dscbrwbj;Z)V}
-       * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget$FurnaceAlternativeButtonWidget;<init>(Lnet/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget;IILnet/minecraft/recipe/RecipeHolder;Z)V}
+       * Mapping not found
        */
-      public FurnaceAlternativeButtonWidget(int i, int j, RecipeHolder<?> arg2, boolean craftable) {
-         super(i, j, arg2, craftable);
+      public FurnaceAlternativeButtonWidget(int i, int j, RecipeHolder<?> arg2, boolean bl) {
+         super(i, j, arg2, bl);
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/text/TextWidget.java namedSrc/net/minecraft/client/gui/widget/text/TextWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/text/TextWidget.java	2023-12-29 00:18:04.113491568 +0000
+++ namedSrc/net/minecraft/client/gui/widget/text/TextWidget.java	2023-12-29 00:17:00.461997442 +0000
@@ -39,10 +39,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wlamjkhk;<init>(IIIILnet/minecraft/unmapped/C_rdaqiwdt;Lnet/minecraft/unmapped/C_mavozmpp;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/text/TextWidget;<init>(IIIILnet/minecraft/text/Text;Lnet/minecraft/client/font/TextRenderer;)V}
     */
-   public TextWidget(int i, int j, int k, int l, Text arg, TextRenderer arg2) {
-      super(i, j, k, l, arg, arg2);
+   public TextWidget(int i, int j, int k, int l, Text arg, TextRenderer textRenderer) {
+      super(i, j, k, l, arg, textRenderer);
       this.active = false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java
--- namedTargetSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2023-12-29 00:18:04.033492203 +0000
+++ namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2023-12-29 00:17:00.345998364 +0000
@@ -170,7 +170,10 @@
          (stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F
       );
       register(Items.BUNDLE, new Identifier("filled"), (stack, world, entity, seed) -> BundleItem.getAmountFilled(stack));
-      register(Items.CLOCK, new Identifier("time"), new UnclampedModelPredicateProvider() {
+      register(
+         Items.CLOCK,
+         new Identifier("time"),
+         new UnclampedModelPredicateProvider() {
          /**
           * @mapping {@literal hashed f_ekiivpis Lnet/minecraft/unmapped/C_pztnfulp$C_dxecmdav;f_ekiivpis:D}
           * @mapping {@literal named time Lnet/minecraft/client/item/ModelPredicateProviderRegistry$C_dxecmdav;time:D}
@@ -188,29 +191,30 @@
          private long lastTick;
 
          /**
-          * Mapping not found
+             * @mapping {@literal hashed unclampedCall Lnet/minecraft/unmapped/C_pztnfulp$C_dxecmdav;unclampedCall(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_ghdnlrrw;Lnet/minecraft/unmapped/C_usxaxydn;I)F}
+             * @mapping {@literal named unclampedCall Lnet/minecraft/client/item/ModelPredicateProviderRegistry$C_dxecmdav;unclampedCall(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/entity/LivingEntity;I)F}
           */
          @Override
-         public float unclampedCall(ItemStack arg, @Nullable ClientWorld arg2x, @Nullable LivingEntity arg3, int i) {
-            Entity lv = (Entity)(arg3 != null ? arg3 : arg.getEntityHolder());
+            public float unclampedCall(ItemStack stack, @Nullable ClientWorld worldx, @Nullable LivingEntity arg3, int i) {
+               Entity lv = (Entity)(arg3 != null ? arg3 : stack.getEntityHolder());
             if (lv == null) {
                return 0.0F;
             } else {
-               if (arg2x == null && lv.getWorld() instanceof ClientWorld arg2x) {
+                  if (worldx == null && lv.getWorld() instanceof ClientWorld worldx) {
                   ;
                }
 
-               if (arg2x == null) {
+                  if (worldx == null) {
                   return 0.0F;
                } else {
                   double d;
-                  if (arg2x.getDimension().natural()) {
-                     d = (double)arg2x.getSkyAngle(1.0F);
+                     if (worldx.getDimension().natural()) {
+                        d = (double)worldx.getSkyAngle(1.0F);
                   } else {
                      d = Math.random();
                   }
 
-                  d = this.getTime(arg2x, d);
+                     d = this.getTime(worldx, d);
                   return (float)d;
                }
             }
@@ -232,7 +236,8 @@
 
             return this.time;
          }
-      });
+         }
+      );
       register(
          Items.COMPASS,
          new Identifier("angle"),
diff -bur namedTargetSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java namedSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java
--- namedTargetSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java	2023-12-29 00:18:04.093491727 +0000
+++ namedSrc/net/minecraft/client/item/UnclampedModelPredicateProvider.java	2023-12-29 00:17:00.437997633 +0000
@@ -15,12 +15,13 @@
 @Environment(EnvType.CLIENT)
 public interface UnclampedModelPredicateProvider extends ModelPredicateProvider {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed call Lnet/minecraft/unmapped/C_cvwubzzl;call(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_ghdnlrrw;Lnet/minecraft/unmapped/C_usxaxydn;I)F}
+    * @mapping {@literal named call Lnet/minecraft/client/item/UnclampedModelPredicateProvider;call(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/entity/LivingEntity;I)F}
     */
    @Deprecated
    @Override
-   default float call(ItemStack arg, @Nullable ClientWorld arg2, @Nullable LivingEntity arg3, int i) {
-      return MathHelper.clamp(this.unclampedCall(arg, arg2, arg3, i), 0.0F, 1.0F);
+   default float call(ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity arg3, int i) {
+      return MathHelper.clamp(this.unclampedCall(stack, world, arg3, i), 0.0F, 1.0F);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java namedSrc/net/minecraft/client/network/ClientCommandSource.java
--- namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java	2023-12-29 00:18:04.085491790 +0000
+++ namedSrc/net/minecraft/client/network/ClientCommandSource.java	2023-12-29 00:17:00.421997760 +0000
@@ -139,9 +139,9 @@
     * Mapping not found
     */
    @Override
-   public boolean hasPermission(int i) {
+   public boolean hasPermission(int level) {
       ClientPlayerEntity lv = this.client.player;
-      return lv != null ? lv.hasPermissionLevel(i) : i == 0;
+      return lv != null ? lv.hasPermissionLevel(level) : level == 0;
    }
 
    /**
@@ -149,9 +149,9 @@
     */
    @Override
    public CompletableFuture<Suggestions> suggestRegistryElements(
-      RegistryKey<? extends Registry<?>> key, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
+      RegistryKey<? extends Registry<?>> registryKey, CommandSource.ElementSuggestionType suggestionType, SuggestionsBuilder builder, CommandContext<?> context
    ) {
-      return (CompletableFuture<Suggestions>)this.getRegistryManager().getOptional(key).map(registry -> {
+      return (CompletableFuture<Suggestions>)this.getRegistryManager().getOptional(registryKey).map(registry -> {
          this.suggestRegistryElements(registry, suggestionType, builder);
          return builder.buildFuture();
       }).orElseGet(() -> this.getCompletions(context));


The remaining diff is too long!

Please sign in to comment.