21w14a - Mappings update

build.gradle

@@ -20,8 +20,8 @@ def ENV = System.getenv()
 
 class Globals {
 	static def baseVersion = "0.32.6"
-	static def mcVersion = "21w13a"
-	static def yarnVersion = "+build.2"
+	static def mcVersion = "21w14a"
+	static def yarnVersion = "+build.1"
 	static def loaderVersion = "0.10.5+build.213"
 	static def preRelease = true
 }

fabric-api-lookup-api-v1/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-api-lookup-api-v1"
-version = getSubprojectVersion(project, "1.0.1")
+version = getSubprojectVersion(project, "1.0.2")
 
 moduleDependencies(project, [
 	'fabric-api-base',

fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlockEntity.java

@@ -46,11 +46,11 @@ public class ChuteBlockEntity extends BlockEntity {
 		}
 
 		if (blockEntity.cachedInsertable == null) {
-			blockEntity.cachedInsertable = BlockApiCache.create(ItemApis.INSERTABLE, (ServerWorld) world, pos.method_35851(Direction.DOWN));
+			blockEntity.cachedInsertable = BlockApiCache.create(ItemApis.INSERTABLE, (ServerWorld) world, pos.offset(Direction.DOWN));
 		}
 
 		if (blockEntity.cachedExtractable == null) {
-			blockEntity.cachedExtractable = BlockApiCache.create(ItemApis.EXTRACTABLE, (ServerWorld) world, pos.method_35851(Direction.UP));
+			blockEntity.cachedExtractable = BlockApiCache.create(ItemApis.EXTRACTABLE, (ServerWorld) world, pos.offset(Direction.UP));
 		}
 
 		if (blockEntity.moveDelay == 0) {

fabric-biome-api-v1/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-biome-api-v1"
-version = getSubprojectVersion(project, "3.1.7")
+version = getSubprojectVersion(project, "3.1.8")
 
 minecraft {
     accessWidener = file("src/main/resources/fabric-biome-api-v1.accesswidener")

fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/api/biome/v1/BiomeSelectors.java

@@ -159,7 +159,7 @@ public final class BiomeSelectors {
 			SpawnSettings spawnSettings = context.getBiome().getSpawnSettings();
 
 			for (SpawnGroup spawnGroup : SpawnGroup.values()) {
-				for (SpawnSettings.SpawnEntry spawnEntry : spawnSettings.getSpawnEntries(spawnGroup).method_34994()) {
+				for (SpawnSettings.SpawnEntry spawnEntry : spawnSettings.getSpawnEntries(spawnGroup).getEntries()) {
 					if (entityTypes.contains(spawnEntry.type)) {
 						return true;
 					}

fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeModificationContextImpl.java

@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableMap;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-import net.minecraft.class_6012;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.sound.BiomeAdditionsSound;
@@ -225,10 +225,10 @@ public class BiomeModificationContextImpl implements BiomeModificationContext {
 	}
 
 	private class GenerationSettingsContextImpl implements GenerationSettingsContext {
-		private final Registry<ConfiguredCarver<?>> carvers = registries.get(Registry.CONFIGURED_CARVER_WORLDGEN);
-		private final Registry<ConfiguredFeature<?, ?>> features = registries.get(Registry.CONFIGURED_FEATURE_WORLDGEN);
-		private final Registry<ConfiguredStructureFeature<?, ?>> structures = registries.get(Registry.CONFIGURED_STRUCTURE_FEATURE_WORLDGEN);
-		private final Registry<ConfiguredSurfaceBuilder<?>> surfaceBuilders = registries.get(Registry.CONFIGURED_SURFACE_BUILDER_WORLDGEN);
+		private final Registry<ConfiguredCarver<?>> carvers = registries.get(Registry.CONFIGURED_CARVER_KEY);
+		private final Registry<ConfiguredFeature<?, ?>> features = registries.get(Registry.CONFIGURED_FEATURE_KEY);
+		private final Registry<ConfiguredStructureFeature<?, ?>> structures = registries.get(Registry.CONFIGURED_STRUCTURE_FEATURE_KEY);
+		private final Registry<ConfiguredSurfaceBuilder<?>> surfaceBuilders = registries.get(Registry.CONFIGURED_SURFACE_BUILDER_KEY);
 		private final GenerationSettings generationSettings = biome.getGenerationSettings();
 		private final GenerationSettingsAccessor accessor = (GenerationSettingsAccessor) generationSettings;
 
@@ -432,10 +432,10 @@ public class BiomeModificationContextImpl implements BiomeModificationContext {
 			fabricSpawners.clear();
 
 			for (SpawnGroup spawnGroup : SpawnGroup.values()) {
-				class_6012<SpawnSettings.SpawnEntry> entries = accessor.fabric_getSpawners().get(spawnGroup);
+				Pool<SpawnSettings.SpawnEntry> entries = accessor.fabric_getSpawners().get(spawnGroup);
 
 				if (entries != null) {
-					fabricSpawners.put(spawnGroup, new ArrayList<>(entries.method_34994()));
+					fabricSpawners.put(spawnGroup, new ArrayList<>(entries.getEntries()));
 				} else {
 					fabricSpawners.put(spawnGroup, new ArrayList<>());
 				}
@@ -452,13 +452,13 @@ public class BiomeModificationContextImpl implements BiomeModificationContext {
 		}
 
 		private void freezeSpawners() {
-			Map<SpawnGroup, class_6012<SpawnSettings.SpawnEntry>> spawners = new HashMap<>(accessor.fabric_getSpawners());
+			Map<SpawnGroup, Pool<SpawnSettings.SpawnEntry>> spawners = new HashMap<>(accessor.fabric_getSpawners());
 
 			for (Map.Entry<SpawnGroup, List<SpawnSettings.SpawnEntry>> entry : fabricSpawners.entrySet()) {
 				if (entry.getValue().isEmpty()) {
-					spawners.put(entry.getKey(), class_6012.method_34990());
+					spawners.put(entry.getKey(), Pool.empty());
 				} else {
-					spawners.put(entry.getKey(), class_6012.method_34988(entry.getValue()));
+					spawners.put(entry.getKey(), Pool.of(entry.getValue()));
 				}
 			}
 

fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/modification/BiomeSelectionContextImpl.java

@@ -54,19 +54,19 @@ public class BiomeSelectionContextImpl implements BiomeSelectionContext {
 
 	@Override
 	public Optional<RegistryKey<ConfiguredSurfaceBuilder<?>>> getSurfaceBuilderKey() {
-		Registry<ConfiguredSurfaceBuilder<?>> registry = dynamicRegistries.get(Registry.CONFIGURED_SURFACE_BUILDER_WORLDGEN);
+		Registry<ConfiguredSurfaceBuilder<?>> registry = dynamicRegistries.get(Registry.CONFIGURED_SURFACE_BUILDER_KEY);
 		return registry.getKey(biome.getGenerationSettings().getSurfaceBuilder().get());
 	}
 
 	@Override
 	public Optional<RegistryKey<ConfiguredFeature<?, ?>>> getFeatureKey(ConfiguredFeature<?, ?> configuredFeature) {
-		Registry<ConfiguredFeature<?, ?>> registry = dynamicRegistries.get(Registry.CONFIGURED_FEATURE_WORLDGEN);
+		Registry<ConfiguredFeature<?, ?>> registry = dynamicRegistries.get(Registry.CONFIGURED_FEATURE_KEY);
 		return registry.getKey(configuredFeature);
 	}
 
 	@Override
 	public Optional<RegistryKey<ConfiguredStructureFeature<?, ?>>> getStructureKey(ConfiguredStructureFeature<?, ?> configuredStructure) {
-		Registry<ConfiguredStructureFeature<?, ?>> registry = dynamicRegistries.get(Registry.CONFIGURED_STRUCTURE_FEATURE_WORLDGEN);
+		Registry<ConfiguredStructureFeature<?, ?>> registry = dynamicRegistries.get(Registry.CONFIGURED_STRUCTURE_FEATURE_KEY);
 		return registry.getKey(configuredStructure);
 	}
 }

fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/mixin/biome/modification/SpawnSettingsAccessor.java

@@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.class_6012;
+import net.minecraft.util.collection.Pool;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.world.biome.SpawnSettings;
@@ -34,11 +34,11 @@ public interface SpawnSettingsAccessor {
 	void fabric_setCreatureSpawnProbability(float probability);
 
 	@Accessor("spawners")
-	Map<SpawnGroup, class_6012<SpawnSettings.SpawnEntry>> fabric_getSpawners();
+	Map<SpawnGroup, Pool<SpawnSettings.SpawnEntry>> fabric_getSpawners();
 
 	@Accessor("spawners")
 	@Mutable
-	void fabric_setSpawners(Map<SpawnGroup, class_6012<SpawnSettings.SpawnEntry>> spawners);
+	void fabric_setSpawners(Map<SpawnGroup, Pool<SpawnSettings.SpawnEntry>> spawners);
 
 	@Accessor("spawnCosts")
 	Map<EntityType<?>, SpawnSettings.SpawnDensity> fabric_getSpawnCosts();

fabric-dimensions-v1/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-dimensions-v1"
-version = getSubprojectVersion(project, "2.0.8")
+version = getSubprojectVersion(project, "2.0.9")
 
 dependencies {
 	testmodCompile project(path: ':fabric-command-api-v1', configuration: 'dev')

fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/FabricDimensionTest.java

@@ -48,12 +48,12 @@ public class FabricDimensionTest implements ModInitializer {
 	// The dimension options refer to the JSON-file in the dimension subfolder of the datapack,
 	// which will always share it's ID with the world that is created from it
 	private static final RegistryKey<DimensionOptions> DIMENSION_KEY = RegistryKey.of(
-			Registry.DIMENSION_OPTIONS,
+			Registry.DIMENSION_KEY,
 			new Identifier("fabric_dimension", "void")
 	);
 
 	private static RegistryKey<World> WORLD_KEY = RegistryKey.of(
-			Registry.DIMENSION,
+			Registry.WORLD_KEY,
 			DIMENSION_KEY.getValue()
 	);
 
@@ -66,7 +66,7 @@ public class FabricDimensionTest implements ModInitializer {
 	public void onInitialize() {
 		Registry.register(Registry.CHUNK_GENERATOR, new Identifier("fabric_dimension", "void"), VoidChunkGenerator.CODEC);
 
-		WORLD_KEY = RegistryKey.of(Registry.DIMENSION, new Identifier("fabric_dimension", "void"));
+		WORLD_KEY = RegistryKey.of(Registry.WORLD_KEY, new Identifier("fabric_dimension", "void"));
 
 		ServerLifecycleEvents.SERVER_STARTED.register(server -> {
 			ServerWorld overworld = server.getWorld(World.OVERWORLD);

fabric-networking-api-v1/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-networking-api-v1"
-version = getSubprojectVersion(project, "1.0.6")
+version = getSubprojectVersion(project, "1.0.7")
 
 moduleDependencies(project, [
 		'fabric-api-base'

fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/client/ClientLoginNetworkAddon.java

@@ -56,7 +56,7 @@ public final class ClientLoginNetworkAddon extends AbstractNetworkAddon<ClientLo
 	}
 
 	public boolean handlePacket(LoginQueryRequestS2CPacket packet) {
-		return handlePacket(packet.getQueryId(), packet.method_36176(), packet.method_36177());
+		return handlePacket(packet.getQueryId(), packet.getChannel(), packet.getPayload());
 	}
 
 	private boolean handlePacket(int queryId, Identifier channelName, PacketByteBuf originalBuf) {

fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/server/ServerLoginNetworkAddon.java

@@ -181,7 +181,7 @@ public final class ServerLoginNetworkAddon extends AbstractNetworkAddon<ServerLo
 	}
 
 	public void registerOutgoingPacket(LoginQueryRequestS2CPacket packet) {
-		this.channels.put(packet.getQueryId(), packet.method_36176());
+		this.channels.put(packet.getQueryId(), packet.getChannel());
 	}
 
 	@Override

fabric-networking-blockentity-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-networking-blockentity-v0"
-version = getSubprojectVersion(project, "0.2.10")
+version = getSubprojectVersion(project, "0.2.11")
 
 moduleDependencies(project, [
 		'fabric-api-base'

fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networking/blockentity/MixinClientPlayNetworkHandler.java

@@ -46,7 +46,7 @@ public class MixinClientPlayNetworkHandler {
 		if (entity instanceof BlockEntityClientSerializable) {
 			if (packet.getBlockEntityType() == 127) {
 				BlockEntityClientSerializable serializable = (BlockEntityClientSerializable) entity;
-				String id = packet.getCompoundTag().getString("id");
+				String id = packet.getNbt().getString("id");
 
 				if (id != null) {
 					Identifier otherIdObj = BlockEntityType.getId(entity.getType());
@@ -60,7 +60,7 @@ public class MixinClientPlayNetworkHandler {
 					String otherId = otherIdObj.toString();
 
 					if (otherId.equals(id)) {
-						serializable.fromClientTag(packet.getCompoundTag());
+						serializable.fromClientTag(packet.getNbt());
 					}
 				}
 			}

fabric-registry-sync-v0/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-registry-sync-v0"
-version = getSubprojectVersion(project, "0.7.7")
+version = getSubprojectVersion(project, "0.7.8")
 
 moduleDependencies(project, [
 		'fabric-api-base',

fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java

@@ -69,13 +69,13 @@ public final class RegistrySyncManager {
 		}
 
 		PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer());
-		buf.writeCompound(tag);
+		buf.writeNbt(tag);
 
 		return ServerPlayNetworking.createS2CPacket(ID, buf);
 	}
 
 	public static void receivePacket(ThreadExecutor<?> executor, PacketByteBuf buf, boolean accept, Consumer<Exception> errorHandler) {
-		NbtCompound compound = buf.readCompound();
+		NbtCompound compound = buf.readNbt();
 
 		if (accept) {
 			try {

fabric-registry-sync-v0/src/testmod/java/net/fabricmc/fabric/test/registry/sync/RegistrySyncTest.java

@@ -113,7 +113,7 @@ public class RegistrySyncTest implements ModInitializer {
 	}
 
 	private void checkFeature(DynamicRegistryManager manager, Identifier id) {
-		Registry<ConfiguredFeature<?, ?>> registry = manager.get(Registry.CONFIGURED_FEATURE_WORLDGEN);
+		Registry<ConfiguredFeature<?, ?>> registry = manager.get(Registry.CONFIGURED_FEATURE_KEY);
 
 		ConfiguredFeature<?, ?> builtInEntry = BuiltinRegistries.CONFIGURED_FEATURE.get(id);
 

fabric-renderer-indigo/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "fabric-renderer-indigo"
-version = getSubprojectVersion(project, "0.4.7")
+version = getSubprojectVersion(project, "0.4.8")
 
 moduleDependencies(project, [
 		'fabric-api-base',

fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoCalculator.java

@@ -379,7 +379,7 @@ public class AoCalculator {
 			final BlockPos.Mutable lightPos = this.lightPos;
 			final BlockPos.Mutable searchPos = this.searchPos;
 
-			lightPos.set(isOnBlockFace ? pos.method_35851(lightFace) : pos);
+			lightPos.set(isOnBlockFace ? pos.offset(lightFace) : pos);
 			AoFace aoFace = AoFace.get(lightFace);
 
 			searchPos.set(lightPos).move(aoFace.neighbors[0]);

fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/TerrainBlockRenderInfo.java

@@ -43,7 +43,7 @@ public class TerrainBlockRenderInfo extends BlockRenderInfo {
 		if ((cullCompletionFlags & mask) == 0) {
 			cullCompletionFlags |= mask;
 
-			if (Block.shouldDrawSide(blockState, blockView, blockPos, face, blockPos.method_35851(face))) {
+			if (Block.shouldDrawSide(blockState, blockView, blockPos, face, blockPos.offset(face))) {
 				cullResultFlags |= mask;
 				return true;
 			} else {