Merge branch '24w40a' into server-task

build.gradle

@@ -92,7 +92,6 @@ dependencies {
  intermediary "net.fabricmc:intermediary:${minecraft_version}:v2"
 }
 
-
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.Opcodes
 import org.quiltmc.draftsman.asm.visitor.DraftsmanAdapterClassVisitor
@@ -117,9 +116,11 @@ clean.doFirst {
 tasks.build.dependsOn "compressTiny", "tinyJar", "v2UnmergedMappingsJar", "v2MergedMappingsJar"
 
 task insertAutoGeneratedMappings(dependsOn: [buildMappingsTiny, downloadPerVersionMappings], type: AddProposedMappingsTask) {
+ final enigmaProfile = file("enigma_profile.json")
+
  inputJar.set mappings.fileConstants.perVersionMappingsJar
  inputMappings.set buildMappingsTiny.outputMappings
- profile.set file("enigma_profile.json")
+ profile.set enigmaProfile
 }
 
 combineUnpickDefinitions {

buildSrc/src/main/java/quilt/internal/Constants.java

@@ -1,7 +1,7 @@
 package quilt.internal;
 
 public class Constants {
- public static final String MINECRAFT_VERSION = "24w39a";
+ public static final String MINECRAFT_VERSION = "24w40a";
 
  public static final String MAPPINGS_NAME = "quilt-mappings";
 

buildSrc/src/main/java/quilt/internal/tasks/build/AddProposedMappingsTask.java

@@ -2,19 +2,30 @@
 
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
-
+import java.util.stream.Stream;
+
+import org.gradle.api.GradleException;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Optional;
+import org.jetbrains.annotations.NotNull;
 import org.quiltmc.enigma.api.Enigma;
 import org.quiltmc.enigma.api.EnigmaProfile;
 import org.quiltmc.enigma.api.EnigmaProject;
+import org.quiltmc.enigma.api.service.JarIndexerService;
 import org.quiltmc.enigma.command.Command;
 import org.quiltmc.enigma.command.FillClassMappingsCommand;
 import org.quiltmc.enigma.command.CommandsUtil;
@@ -38,35 +49,63 @@
 import quilt.internal.Constants;
 import quilt.internal.tasks.DefaultMappingsTask;
 
-public class AddProposedMappingsTask extends DefaultMappingsTask {
+import static org.quiltmc.enigma_plugin.Arguments.SIMPLE_TYPE_FIELD_NAMES_PATH;
+
+public abstract class AddProposedMappingsTask extends DefaultMappingsTask {
+ private static Path getPath(RegularFileProperty fileProperty) {
+ return fileProperty.map(RegularFile::getAsFile).map(File::toPath).get();
+ }
+
  @OutputFile
  public File outputMappings;
 
  @InputFile
- private final Property<File> inputJar;
+ public abstract RegularFileProperty getInputJar();
 
  @InputFile
- private final Property<File> inputMappings;
+ public abstract RegularFileProperty getInputMappings();
 
  @InputFile
- private final Property<File> profile;
+ public abstract RegularFileProperty getProfile();
+
+ @Optional
+ @InputFiles
+ protected abstract Property<FileCollection> getSimpleTypeFieldNames();
 
  public AddProposedMappingsTask() {
  super(Constants.Groups.BUILD_MAPPINGS_GROUP);
- outputMappings = new File(fileConstants.buildDir, getName() + ".tiny");
- inputJar = getProject().getObjects().property(File.class);
- inputMappings = getProject().getObjects().property(File.class);
- profile = getProject().getObjects().property(File.class);
+ this.outputMappings = new File(fileConstants.buildDir, getName() + ".tiny");
+
+ this.getSimpleTypeFieldNames().set(
+ this.getProfile()
+ .map(RegularFile::getAsFile)
+ .map(File::toPath)
+ .map(profilePath -> {
+ try {
+ return this.getProject().files(
+ EnigmaProfile.read(profilePath).getServiceProfiles(JarIndexerService.TYPE).stream()
+ .flatMap(service -> service.getArgument(SIMPLE_TYPE_FIELD_NAMES_PATH).stream())
+ .map(stringOrStrings -> stringOrStrings.mapBoth(Stream::of, Collection::stream))
+ .flatMap(bothStringStreams ->
+ bothStringStreams.left().orElseGet(bothStringStreams::rightOrThrow)
+ )
+ .toList()
+ );
+ } catch (IOException e) {
+ throw new GradleException("Failed to read enigma profile", e);
+ }
+ })
+ );
  }
 
  @TaskAction
  public void addProposedMappings() throws Exception {
  getLogger().lifecycle(":seeking auto-mappable entries");
 
- Path input = inputMappings.get().toPath();
+ Path input = getPath(this.getInputMappings());
  Path output = outputMappings.toPath();
- Path jar = inputJar.get().toPath();
- Path profilePath = profile.map(File::toPath).get();
+ Path jar = getPath(this.getInputJar());
+ Path profilePath = getPath(this.getProfile());
 
  addProposedMappings(input, output, fileConstants.tempDir.toPath(), jar, profilePath);
  }
@@ -204,16 +243,4 @@ public File getOutputMappings() {
  public void setOutputMappings(File outputMappings) {
  this.outputMappings = outputMappings;
  }
-
- public Property<File> getInputJar() {
- return inputJar;
- }
-
- public Property<File> getInputMappings() {
- return inputMappings;
- }
-
- public Property<File> getProfile() {
- return profile;
- }
 }

buildSrc/src/main/resources/minecraft_specific_words.txt

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

mappings/net/minecraft/SharedConstants.mapping

@@ -8,6 +8,7 @@ CLASS net/minecraft/unmapped/C_otltijcb net/minecraft/SharedConstants
  FIELD f_cpvbggkb RESOURCE_GENERATION_DEBUG_OVERRIDE Z
  FIELD f_croffrlr ENABLE_WORLD_RECREATION_DEBUGGER Z
  FIELD f_cwtltrpn ENABLE_GOAL_SELECTOR_DEBUGGER Z
+ FIELD f_czwrerlm DEBUG_EXPERIMENTAL_REDSTONE_WIRE_UPDATE_ORDER Z
  FIELD f_daxksksq generateSquareTerrainWithoutNoise Z
  FIELD f_dwxtvjnd DEBUG_FEATURE_COUNT Z
  FIELD f_dzwzxzvb DISABLE_LIQUID_SPREADING Z

mappings/net/minecraft/advancement/AdvancementRewards.mapping

@@ -14,15 +14,15 @@ CLASS net/minecraft/unmapped/C_wptigggq net/minecraft/advancement/AdvancementRew
  METHOD m_comwhrux experience (I)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
  ARG 0 experience
  METHOD m_dooyiisa build ()Lnet/minecraft/unmapped/C_wptigggq;
- METHOD m_kcbmnmlt recipe (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
- ARG 0 recipe
+ METHOD m_kcbmnmlt recipe (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
  METHOD m_qfziciny setFunction (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
  ARG 1 function
  METHOD m_qnlsiipc setExperience (I)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
  ARG 1 experience
- METHOD m_rkbrzuwh addRecipe (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
- ARG 1 recipe
+ METHOD m_rkbrzuwh addRecipe (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
  METHOD m_sbnvjevi loot (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
+ ARG 0 loot
  METHOD m_xgembxfc function (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
  ARG 0 function
  METHOD m_xltlznvb addLoot (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_wptigggq$C_wbctdknv;
+ ARG 1 loot

mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger.mapping

@@ -1,9 +1,11 @@
 CLASS net/minecraft/unmapped/C_ccuyenqy net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger
  METHOD m_bwskqxvw trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_xhhleach;)V
  ARG 1 player
+ ARG 2 lootTable
  METHOD m_wjdeumci (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_ccuyenqy$C_jvilurms;)Z
  ARG 1 conditions
  CLASS C_jvilurms Conditions
  FIELD f_zdzuorlo lootTable Lnet/minecraft/unmapped/C_xhhleach;
  METHOD m_ocoesmqp matches (Lnet/minecraft/unmapped/C_xhhleach;)Z
+ ARG 1 lootTable
  METHOD m_sdawxryt create (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz;

mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger.mapping

@@ -1,21 +1,11 @@
 CLASS net/minecraft/unmapped/C_thfyxhzz net/minecraft/advancement/criterion/RecipeCraftedCriterionTrigger
- METHOD m_erktjebj trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V
+ METHOD m_erktjebj trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/List;)V
  ARG 1 player
- ARG 2 recipeId
  ARG 3 ingredients
- METHOD m_zjkktotq (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;Lnet/minecraft/unmapped/C_thfyxhzz$C_fznnyxkh;)Z
+ METHOD m_zjkktotq (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/List;Lnet/minecraft/unmapped/C_thfyxhzz$C_fznnyxkh;)Z
  ARG 2 conditions
  CLASS C_fznnyxkh Conditions
- FIELD f_tliwdtji recipeId Lnet/minecraft/unmapped/C_ncpywfca;
- METHOD <init> (Ljava/util/Optional;Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)V
- ARG 1 playerPredicate
- METHOD m_daeektkr create (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz;
- ARG 0 recipeId
- METHOD m_lioifgzt create (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)Lnet/minecraft/unmapped/C_rzypsigz;
- ARG 0 recipeId
- ARG 1 ingredients
- METHOD m_srqmbfmi matches (Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/List;)Z
- ARG 1 recipeId
+ FIELD f_tliwdtji recipeId Lnet/minecraft/unmapped/C_xhhleach;
+ METHOD m_srqmbfmi matches (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/List;)Z
  ARG 2 stacks
- METHOD m_zrhvqutd crafterCraftedItem (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz;
- ARG 0 recipeId
+ METHOD m_zrhvqutd crafterCraftedItem (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz;

mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger.mapping

@@ -1,14 +1,11 @@
 CLASS net/minecraft/unmapped/C_myulluhr net/minecraft/advancement/criterion/RecipeUnlockedCriterionTrigger
- METHOD m_cvaeuvfg create (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_rzypsigz;
- ARG 0 id
+ METHOD m_cvaeuvfg create (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_rzypsigz;
  METHOD m_jubbglvn trigger (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_dscbrwbj;)V
  ARG 1 player
  ARG 2 unlocker
  METHOD m_zydfddgn (Lnet/minecraft/unmapped/C_dscbrwbj;Lnet/minecraft/unmapped/C_myulluhr$C_zzjwgfkt;)Z
  ARG 1 conditions
  CLASS C_zzjwgfkt Conditions
- FIELD f_yhqfrsgg recipe Lnet/minecraft/unmapped/C_ncpywfca;
- METHOD <init> (Ljava/util/Optional;Lnet/minecraft/unmapped/C_ncpywfca;)V
- ARG 1 playerPredicate
+ FIELD f_yhqfrsgg recipe Lnet/minecraft/unmapped/C_xhhleach;
  METHOD m_pjzabcwj matches (Lnet/minecraft/unmapped/C_dscbrwbj;)Z
  ARG 1 unlocker

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -167,6 +167,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  ARG 2 world
  ARG 3 pos
  ARG 4 block
+ ARG 5 orientation
  ARG 6 notify
  METHOD m_umbsjste rotate (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_mboglirk;)Lnet/minecraft/unmapped/C_txtbiemp;
  COMMENT Applies a block rotation to a block state.
@@ -227,14 +228,19 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  ARG 3 pos
  ARG 4 context
  CLASS C_eibemhky AbstractBlockState
+ FIELD f_biaogsvo FULL_BLOCK_OCCLUSION_SHAPES [Lnet/minecraft/unmapped/C_zscvhwbd;
+ FIELD f_bsbhmsca cullingShape Lnet/minecraft/unmapped/C_zscvhwbd;
+ FIELD f_bvttwnii EMPTY_OCCLUSION_SHAPES [Lnet/minecraft/unmapped/C_zscvhwbd;
  FIELD f_ciiuhosx opaque Z
  FIELD f_cmbiwnda hasSidedTransparency Z
+ FIELD f_gbcdxrgd DIRECTIONS [Lnet/minecraft/unmapped/C_xpuuihxf;
  FIELD f_jnxtuzdb hardness F
  FIELD f_jvcpotqu isAir Z
  FIELD f_lpessbtt pistonBehavior Lnet/minecraft/unmapped/C_mojvzhua;
  FIELD f_lqzypovm spawnsDustParticles Z
  FIELD f_mkfwgndk solidBlockPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
  FIELD f_nijrkoes emissiveLightingPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
+ FIELD f_nsclhbdi opacity I
  FIELD f_ochxyzpr solid Z
  FIELD f_omahusur liquid Z
  FIELD f_rmmimkow replaceable Z
@@ -246,12 +252,16 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  FIELD f_vskisdzk postProcessPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
  FIELD f_wknecqnz luminance I
  FIELD f_wvbmkgls suffocationPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
+ FIELD f_xogzmbzi isTransparent Z
  FIELD f_xwxdktuf hasRandomTicks Z
+ FIELD f_xxewnzdk opaqueFullCube Z
+ FIELD f_ycbjvypj cullingFaces [Lnet/minecraft/unmapped/C_zscvhwbd;
  FIELD f_yypdsdkn lavaIgnitable Z
  FIELD f_zpvdfobl mapColor Lnet/minecraft/unmapped/C_mlrprqox;
  FIELD f_zzuoeazs instrument Lnet/minecraft/unmapped/C_onjtjtsi;
  METHOD m_aeqyhmrr neighborUpdate (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ctatbkvy;Z)V
  ARG 2 pos
+ ARG 4 orientation
  ARG 5 notify
  METHOD m_alvmezvc getInstrument ()Lnet/minecraft/unmapped/C_onjtjtsi;
  METHOD m_aoahmjkt getSoundGroup ()Lnet/minecraft/unmapped/C_aevintex;
@@ -321,6 +331,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  COMMENT {@return whether this block state is an instance of the given block holder}
  ARG 1 block
  COMMENT the block holder to match
+ METHOD m_fpkvjpml ([Lnet/minecraft/unmapped/C_zscvhwbd;)V
+ ARG 0 directions
  METHOD m_fuqgdrck isOf (Lnet/minecraft/unmapped/C_mmxmpdoq;)Z
  COMMENT {@return whether this block state is an instance of the given block}
  ARG 1 block
@@ -391,6 +403,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  ARG 2 direction
  METHOD m_pobwdefx exceedsCube ()Z
  METHOD m_pppprjpr isTransparent ()Z
+ METHOD m_ptlyqoli ([Lnet/minecraft/unmapped/C_zscvhwbd;)V
+ ARG 0 directions
  METHOD m_pvjmhzzb getOpacity ()I
  METHOD m_qcyiqint hasComparatorOutput ()Z
  METHOD m_qilylxum onUse (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;
@@ -431,6 +445,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  METHOD m_tjbimmww canBucketPlace (Lnet/minecraft/unmapped/C_rxhyurmy;)Z
  ARG 1 fluid
  METHOD m_trxxnxke isRegistryKey (Lnet/minecraft/unmapped/C_xhhleach;)Z
+ ARG 1 key
  METHOD m_uawreshq getCameraCollisionShape (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_pbfjvesm;)Lnet/minecraft/unmapped/C_zscvhwbd;
  ARG 1 world
  ARG 2 pos
@@ -547,6 +562,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  FIELD f_czlbhsfs dynamicBounds Z
  FIELD f_ddynwztk velocityMultiplier F
  FIELD f_dfulysva toolRequired Z
+ FIELD f_eioycbda key Lnet/minecraft/unmapped/C_xhhleach;
  FIELD f_gepbjyhg nonSolid Z
  FIELD f_gljcimhm emissiveLightingPredicate Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
  FIELD f_hgzeyqby randomTicks Z
@@ -593,6 +609,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  ARG 1 predicate
  METHOD m_edlblpmg offsetType (Lnet/minecraft/unmapped/C_triydqro$C_hqjgaunn;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
  ARG 1 offsetType
+ METHOD m_egobildr (Lnet/minecraft/unmapped/C_xhhleach;)Ljava/util/Optional;
+ ARG 0 key
  METHOD m_etdgbdsz replaceable ()Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
  METHOD m_fqzrcagx jumpVelocityMultiplier (F)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
  ARG 1 jumpVelocityMultiplier
@@ -657,6 +675,8 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
  COMMENT @return this
  METHOD m_vuhrtmql (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_mlrprqox;
  ARG 0 state
+ METHOD m_vuvrdzlb key (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
+ ARG 1 key
  METHOD m_wlqavdtn mapColor (Lnet/minecraft/unmapped/C_arllgqae;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;
  ARG 1 dyeColor
  METHOD m_wrutkowk blockVision (Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;)Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;

mappings/net/minecraft/block/Block.mapping

@@ -49,6 +49,8 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
  FIELD f_zatyqcqa CODEC Lcom/mojang/serialization/MapCodec;
  FIELD f_zeveupfs NO_REDRAW I
  COMMENT Used in conjunction with {@link #NOTIFY_LISTENERS} to suppress the render pass on clients.
+ FIELD f_zobgxnry SKIP_UPDATE_FOR_REDSTONE_WIRE I
+ COMMENT Skips {@link AbstractBlock#getStateForNeighborUpdate} call for redstone wire.
  METHOD m_aqcetwet onSteppedOn (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_astfners;)V
  COMMENT Called when an entity steps on this block.
  ARG 1 world
@@ -184,6 +186,8 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
  COMMENT the bitwise flags for {@link net.minecraft.world.ModifiableWorld#setBlockState(BlockPos, BlockState, int, int)}
  ARG 5 maxUpdateDepth
  COMMENT the limit for the cascading block updates
+ METHOD m_oscwylqf updateEntityVelocityAfterFall (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_astfners;)V
+ ARG 2 entity
  METHOD m_pdzevtfw copyProperty (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vzlztuyw;)Lnet/minecraft/unmapped/C_txtbiemp;
  ARG 0 source
  ARG 1 target
@@ -268,7 +272,9 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
  ARG 2 stack
  METHOD m_zpnlglhs shouldDrawSide (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
  ARG 0 state
+ ARG 1 sideState
  ARG 2 side
+ CLASS C_epynadow ShapePair
  CLASS C_miiagdeq
  METHOD load (Ljava/lang/Object;)Ljava/lang/Object;
  ARG 1 shape

mappings/net/minecraft/block/Blocks.mapping

@@ -1,5 +1,7 @@
 CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
  FIELD f_lfmqbeqz SHULKER_BOX_SUFFOCATES_PREDICATE Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;
+ METHOD m_cptpfson register (Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq;
+ ARG 0 key
  METHOD m_knkwxiyx solid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
  METHOD m_nmstzpxh spawnable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ogavsvbr;)Ljava/lang/Boolean;
  ARG 3 entityType
@@ -11,4 +13,5 @@ CLASS net/minecraft/unmapped/C_jricjyva net/minecraft/block/Blocks
  ARG 3 entityType
  METHOD m_tobwsgju waterlogMapColor (Lnet/minecraft/unmapped/C_mlrprqox;)Ljava/util/function/Function;
  ARG 0 color
+ METHOD m_vfpzuwtj register (Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)Lnet/minecraft/unmapped/C_mmxmpdoq;
  METHOD m_wjfyifdb nonSolid (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z

mappings/net/minecraft/block/CampfireBlock.mapping

@@ -36,8 +36,6 @@ CLASS net/minecraft/unmapped/C_gcjouocd net/minecraft/block/CampfireBlock
  ARG 0 campfire
  METHOD m_nefpojyl doesBlockCauseSignalFire (Lnet/minecraft/unmapped/C_txtbiemp;)Z
  ARG 1 state
- METHOD m_upiidcqg (Lnet/minecraft/unmapped/C_triydqro$C_eibemhky;)Z
- ARG 0 block
  METHOD m_vehfpozy isLitCampfireInRange (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Z
  ARG 0 world
  ARG 1 pos