Port to 1.21.6

build-logic/src/main/java/qsl/internal/Versions.java

@@ -29,17 +29,17 @@ public final class Versions {
 	/**
 	 * The target Minecraft version.
 	 */
-	public static final MinecraftVersion MINECRAFT_VERSION = new MinecraftVersion("1.21.5");
+	public static final MinecraftVersion MINECRAFT_VERSION = new MinecraftVersion("1.21.6");
 
 	/**
 	 * The Minecraft versions this version of QSL is compatible with.
 	 */
-	public static final List<MinecraftVersion> COMPATIBLE_VERSIONS = versions("1.21.5");
+	public static final List<MinecraftVersion> COMPATIBLE_VERSIONS = versions("1.21.6");
 
 	/**
 	 * The target Quilt Mappings build.
 	 */
-	public static final int MAPPINGS_BUILD = 7;
+	public static final int MAPPINGS_BUILD = 6;
 
 	/**
 	 * The version of Quilt Loader to use.

library/block/block_entity/src/testmod/java/org/quiltmc/qsl/block/entity/test/ColorfulBlockEntity.java

@@ -28,6 +28,8 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkSectionPos;
+import net.minecraft.world.storage.DataReader;
+import net.minecraft.world.storage.DataWriter;
 
 import org.quiltmc.qsl.block.entity.api.QuiltBlockEntity;
 
@@ -55,11 +57,11 @@ public int getColor() {
 	/* Serialization */
 
 	@Override
-	public void readNbtImpl(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
-		super.readNbtImpl(nbt, lookupProvider);
+	public void readNbtImpl(DataReader reader) {
+		super.readNbtImpl(reader);
 
 		try {
-			this.color = Integer.parseInt(nbt.getString("color").orElseThrow(), 16);
+			this.color = Integer.parseInt(reader.readString("color").orElseThrow(), 16);
 		} catch (NumberFormatException e) {
 			this.color = 0;
 		}
@@ -80,14 +82,14 @@ public void refreshRendering() {
 	}
 
 	@Override
-	public void writeNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
-		super.writeNbt(nbt, lookupProvider);
-		nbt.putString("color", Integer.toHexString(this.color));
+	public void writeNbt(DataWriter writer) {
+		super.writeNbt(writer);
+		writer.writeString("color", Integer.toHexString(this.color));
 	}
 
 	@Override
 	public NbtCompound toSyncedNbt(HolderLookup.Provider lookupProvider) {
-		return this.toNbt(lookupProvider);
+		return this.method_38244(lookupProvider);
 	}
 
 	@Override

library/block/block_entity/src/testmod/java/org/quiltmc/qsl/block/entity/test/client/BlockEntityTypeTestClient.java

@@ -18,7 +18,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.client.color.block.BlockColorProvider;
-import net.minecraft.client.render.RenderLayer;
+import net.minecraft.unmapped.C_nihubpux;
 
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.loader.api.minecraft.ClientOnly;
@@ -42,6 +42,6 @@ public class BlockEntityTypeTestClient implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient(ModContainer mod) {
-		BlockRenderLayerMap.put(RenderLayer.getCutout(), BlockEntityTypeTest.ANGY_BLOCKS.toArray(Block[]::new));
+		BlockRenderLayerMap.put(C_nihubpux.CUTOUT, BlockEntityTypeTest.ANGY_BLOCKS.toArray(Block[]::new));
 	}
 }

library/block/block_extensions/src/main/java/org/quiltmc/qsl/block/extensions/api/client/BlockRenderLayerMap.java

@@ -19,6 +19,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.fluid.Fluid;
+import net.minecraft.unmapped.C_nihubpux;
 
 import org.quiltmc.loader.api.minecraft.ClientOnly;
 import org.quiltmc.qsl.block.extensions.impl.client.BlockRenderLayerMapImpl;
@@ -36,7 +37,7 @@ private BlockRenderLayerMap() {}
 	 * @param layer  new render layer
 	 * @param blocks target blocks
 	 */
-	public static void put(RenderLayer layer, Block... blocks) {
+	public static void put(C_nihubpux layer, Block... blocks) {
 		for (var block : blocks) {
 			BlockRenderLayerMapImpl.put(block, layer);
 		}
@@ -48,7 +49,7 @@ public static void put(RenderLayer layer, Block... blocks) {
 	 * @param layer  new render layer
 	 * @param fluids target fluids
 	 */
-	public static void put(RenderLayer layer, Fluid... fluids) {
+	public static void put(C_nihubpux layer, Fluid... fluids) {
 		for (var fluid : fluids) {
 			BlockRenderLayerMapImpl.put(fluid, layer);
 		}

library/block/block_extensions/src/main/java/org/quiltmc/qsl/block/extensions/impl/client/BlockRenderLayerMapImpl.java

@@ -19,27 +19,28 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
 import org.jetbrains.annotations.ApiStatus;
+import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.fluid.Fluid;
+import net.minecraft.unmapped.C_nihubpux;
 
 import org.quiltmc.loader.api.minecraft.ClientOnly;
 
 @ApiStatus.Internal
 @ClientOnly
 public final class BlockRenderLayerMapImpl {
-	private BlockRenderLayerMapImpl() {}
+	private BlockRenderLayerMapImpl() {
+	}
 
-	private static Map<Block, RenderLayer> blockMap = new Reference2ReferenceOpenHashMap<>();
-	private static Map<Fluid, RenderLayer> fluidMap = new Reference2ReferenceOpenHashMap<>();
+	private static Map<Block, C_nihubpux> blockMap = new Reference2ReferenceOpenHashMap<>();
+	private static Map<Fluid, C_nihubpux> fluidMap = new Reference2ReferenceOpenHashMap<>();
 
-	private static BiConsumer<Block, RenderLayer> blockHandler = blockMap::put;
-	private static BiConsumer<Fluid, RenderLayer> fluidHandler = fluidMap::put;
+	private static BiConsumer<Block, C_nihubpux> blockHandler = blockMap::put;
+	private static BiConsumer<Fluid, C_nihubpux> fluidHandler = fluidMap::put;
 
-	public static void initialize(BiConsumer<Block, RenderLayer> blockHandlerIn, BiConsumer<Fluid, RenderLayer> fluidHandlerIn) {
+	public static void initialize(BiConsumer<Block, C_nihubpux> blockHandlerIn, BiConsumer<Fluid, C_nihubpux> fluidHandlerIn) {
 		// Add pre-existing render layer assignments.
 		if (blockMap != null) {
 			blockMap.forEach(blockHandlerIn);
@@ -58,11 +59,11 @@ public static void initialize(BiConsumer<Block, RenderLayer> blockHandlerIn, BiC
 		fluidMap = null;
 	}
 
-	public static void put(Block block, RenderLayer layer) {
+	public static void put(Block block, C_nihubpux layer) {
 		blockHandler.accept(block, layer);
 	}
 
-	public static void put(Fluid fluid, RenderLayer layer) {
+	public static void put(Fluid fluid, C_nihubpux layer) {
 		fluidHandler.accept(fluid, layer);
 	}
 }

library/block/block_extensions/src/main/java/org/quiltmc/qsl/block/extensions/mixin/client/RenderLayersMixin.java

@@ -18,12 +18,12 @@
 
 import java.util.Map;
 
+import net.minecraft.unmapped.C_nihubpux;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.RenderLayers;
 import net.minecraft.fluid.Fluid;
 
@@ -35,12 +35,12 @@
 public abstract class RenderLayersMixin {
 	@Shadow
 	@Final
-	private static Map<Block, RenderLayer> BLOCKS;
+	private static Map<Block, C_nihubpux> BLOCKS;
 	@Shadow
 	@Final
-	private static Map<Fluid, RenderLayer> FLUIDS;
+	private static Map<Fluid, C_nihubpux> field_60921;
 
 	static {
-		BlockRenderLayerMapImpl.initialize(BLOCKS::put, FLUIDS::put);
+		BlockRenderLayerMapImpl.initialize(BLOCKS::put, field_60921::put);
 	}
 }

library/block/block_extensions/src/testmod/java/org/quiltmc/qsl/block/extensions/test/ClientInitializer.java

@@ -16,7 +16,7 @@
 
 package org.quiltmc.qsl.block.extensions.test;
 
-import net.minecraft.client.render.RenderLayer;
+import net.minecraft.unmapped.C_nihubpux;
 
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.loader.api.minecraft.ClientOnly;
@@ -27,7 +27,7 @@
 public final class ClientInitializer implements ClientModInitializer {
 	@Override
 	public void onInitializeClient(ModContainer mod) {
-		BlockRenderLayerMap.put(RenderLayer.getTranslucent(), Initializer.BLOCK);
-		BlockRenderLayerMap.put(RenderLayer.getCutout(), Initializer.BLOCK2);
+		BlockRenderLayerMap.put(C_nihubpux.TRANSLUCENT, Initializer.BLOCK);
+		BlockRenderLayerMap.put(C_nihubpux.CUTOUT, Initializer.BLOCK2);
 	}
 }

library/core/lifecycle_events/src/testmod/java/org/quiltmc/qsl/lifecycle/test/event/ServerLifecycleTests.java

@@ -20,6 +20,7 @@
 import org.slf4j.LoggerFactory;
 
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.test.TestManager;
 
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
@@ -44,6 +45,9 @@ public void onInitialize(ModContainer mod) {
 		ServerWorldLoadEvents.UNLOAD.register((server, world) -> {
 			LOGGER.info("Unloaded world " + world.getRegistryKey().getValue().toString());
 		});
+
+		// method_71664 is startTicking
+		TestManager.INSTANCE.method_71664();
 	}
 
 	@Override

library/core/networking/src/main/java/org/quiltmc/qsl/networking/api/LoginPacketSender.java

@@ -19,10 +19,10 @@
 
 import java.util.Objects;
 
+import io.netty.channel.ChannelFutureListener;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.login.payload.CustomQueryPayload;
@@ -67,7 +67,7 @@ default void sendPacket(Identifier channel, PacketByteBuf buf) {
 	 * @param buf the content of the packet
 	 * @param listener an optional listener containing callbacks to execute after the packet is sent, may be {@code null}
 	 */
-	default void sendPacket(Identifier channel, PacketByteBuf buf, @Nullable PacketSendListener listener) {
+	default void sendPacket(Identifier channel, PacketByteBuf buf, @Nullable ChannelFutureListener listener) {
 		Objects.requireNonNull(channel, "Channel cannot be null");
 		Objects.requireNonNull(buf, "Payload cannot be null");
 

library/core/networking/src/main/java/org/quiltmc/qsl/networking/api/PacketSendListeners.java

@@ -16,11 +16,11 @@
 
 package org.quiltmc.qsl.networking.api;
 
+import io.netty.channel.ChannelFutureListener;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.network.PacketSendListener;
-import net.minecraft.network.packet.Packet;
 
 /**
  * Utilities for working with {@link PacketSendListener}s.
@@ -34,12 +34,11 @@ public final class PacketSendListeners {
 	 * @param runnable the runnable to run on success
 	 */
 	@Contract(value = "null -> null; !null -> new", pure = true)
-	public static PacketSendListener ifSuccess(Runnable runnable) {
+	public static ChannelFutureListener ifSuccess(Runnable runnable) {
 		if (runnable == null) return null;
 
-		return new PacketSendListener() {
-			@Override
-			public void onSuccess() {
+		return (channelFuture) -> {
+			if (channelFuture.isSuccess()) {
 				runnable.run();
 			}
 		};
@@ -53,7 +52,7 @@ public void onSuccess() {
 	 * @return the combined packet send listeners, may be {@code null} if both the first and second packet send listeners are {@code null}
 	 */
 	@Contract(value = "_, null -> param1; null, _ -> param2; !null, !null -> new", pure = true)
-	public static PacketSendListener union(@Nullable PacketSendListener first, @Nullable PacketSendListener second) {
+	public static ChannelFutureListener union(@Nullable ChannelFutureListener first, @Nullable ChannelFutureListener second) {
 		if (first == null && second == null) {
 			return null;
 		} else if (second == null) {
@@ -62,24 +61,9 @@ public static PacketSendListener union(@Nullable PacketSendListener first, @Null
 			return second;
 		}
 
-		return new PacketSendListener() {
-			@Override
-			public void onSuccess() {
-				first.onSuccess();
-				second.onSuccess();
-			}
-
-			@Override
-			public @Nullable Packet<?> getFailurePacket() {
-				var firstPacket = first.getFailurePacket();
-				var secondPacket = second.getFailurePacket();
-
-				if (firstPacket == null) {
-					return secondPacket;
-				}
-
-				return firstPacket;
-			}
+		return (channelFuture) -> {
+			first.operationComplete(channelFuture);
+			second.operationComplete(channelFuture);
 		};
 	}
 

library/core/networking/src/main/java/org/quiltmc/qsl/networking/api/PacketSender.java

@@ -18,9 +18,9 @@
 
 import java.util.Objects;
 
+import io.netty.channel.ChannelFutureListener;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.packet.Packet;
 
 /**
@@ -49,7 +49,7 @@ public interface PacketSender<C> {
 	 * @param packet   the packet
 	 * @param listener an optional listener containing callbacks to execute after the packet is sent, may be {@code null}
 	 */
-	void sendPacket(Packet<?> packet, @Nullable PacketSendListener listener);
+	void sendPacket(Packet<?> packet, @Nullable ChannelFutureListener listener);
 
 	/**
 	 * Sends a packet to a channel.

library/core/networking/src/main/java/org/quiltmc/qsl/networking/api/PlayerLookup.java

@@ -175,7 +175,7 @@ public static Collection<ServerPlayerEntity> around(ServerWorld world, Vec3d pos
 
 		return world(world)
 				.stream()
-				.filter((p) -> p.squaredDistanceTo(pos) <= radiusSq)
+				.filter((p) -> p.getSquaredDistanceTo(pos) <= radiusSq)
 				.collect(Collectors.toList());
 	}
 
@@ -194,7 +194,7 @@ public static Collection<ServerPlayerEntity> around(ServerWorld world, Vec3i pos
 
 		return world(world)
 				.stream()
-				.filter((p) -> p.squaredDistanceTo(pos.getX(), pos.getY(), pos.getZ()) <= radiusSq)
+				.filter((p) -> p.getSquaredDistanceTo(pos.getX(), pos.getY(), pos.getZ()) <= radiusSq)
 				.collect(Collectors.toList());
 	}
 

library/core/networking/src/main/java/org/quiltmc/qsl/networking/api/client/ClientLoginNetworking.java

@@ -21,13 +21,13 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import io.netty.channel.ChannelFutureListener;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientLoginNetworkHandler;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.listener.PacketListener;
 import net.minecraft.network.packet.payload.CustomPayload;
 import net.minecraft.util.Identifier;
@@ -171,7 +171,7 @@ public interface QueryRequestReceiver {
 		 */
 		CompletableFuture<PacketByteBuf> receive(
 				MinecraftClient client, ClientLoginNetworkHandler handler, PacketByteBuf buf,
-				Consumer<PacketSendListener> listenerAdder
+				Consumer<ChannelFutureListener> listenerAdder
 		);
 	}
 }

library/core/networking/src/main/java/org/quiltmc/qsl/networking/api/server/ServerPlayNetworking.java

@@ -290,7 +290,7 @@ public static void send(Collection<ServerPlayerEntity> players, CustomPayload pa
 	public static MinecraftServer getServer(ServerPlayNetworkHandler handler) {
 		Objects.requireNonNull(handler, "Network handler cannot be null");
 
-		return handler.player.server;
+		return handler.player.getServer();
 	}
 
 	private ServerPlayNetworking() {