26.1 Support

.editorconfig

@@ -0,0 +1,4 @@
+root=true
+
+[*]
+insert_final_newline = false

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
 	id 'maven-publish'
 }
 
@@ -21,11 +21,10 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 }
@@ -45,7 +44,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
@@ -54,8 +53,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 test {

gradle.properties

@@ -1,18 +1,18 @@
-# Done to increase the memory available to gradle.
+# Done to increase the memory available to Gradle.
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 org.gradle.configuration-cache=false
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.11
+minecraft_version=26.1-pre-2
 loader_version=0.18.4
-loom_version=1.14-SNAPSHOT
+loom_version=1.15-SNAPSHOT
 
 # Mod Properties
 mod_version=1.0.2
 maven_group=net.azureaaron.hmapi
 archives_base_name=hm-api
 
 # Dependencies
-fabric_api_version=0.141.3+1.21.11
+fabric_api_version=0.143.14+26.1

src/main/java/net/azureaaron/hmapi/HMApi.java

@@ -12,7 +12,7 @@
 import net.azureaaron.hmapi.network.packet.s2c.HypixelS2CPacket;
 import net.azureaaron.hmapi.network.packet.v1.s2c.LocationUpdateS2CPacket;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommands;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.loader.api.FabricLoader;
@@ -46,21 +46,21 @@ public void onInitializeClient() {
 	}
 
 	private static void registerCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext registryAccess) {
-		dispatcher.register(ClientCommandManager.literal("hmapi")
-				.then(ClientCommandManager.literal("sendPacket")
-						.then(ClientCommandManager.literal("partyInfo2")
+		dispatcher.register(ClientCommands.literal("hmapi")
+				.then(ClientCommands.literal("sendPacket")
+						.then(ClientCommands.literal("partyInfo2")
 								.executes(context -> {
 									HypixelNetworking.sendPartyInfoC2SPacket(2);
 
 									return Command.SINGLE_SUCCESS;
 								}))
-						.then(ClientCommandManager.literal("playerInfo")
+						.then(ClientCommands.literal("playerInfo")
 								.executes(context -> {
 									HypixelNetworking.sendPlayerInfoC2SPacket(1);
 
 									return Command.SINGLE_SUCCESS;
 								}))
-						.then(ClientCommandManager.literal("register4LocationUpdates")
+						.then(ClientCommands.literal("register4LocationUpdates")
 								.executes(context -> {
 									HypixelNetworking.registerToEvents(Util.make(new Object2IntOpenHashMap<>(), map -> {
 										map.put(LocationUpdateS2CPacket.ID, 1);
@@ -69,7 +69,7 @@ private static void registerCommands(CommandDispatcher<FabricClientCommandSource
 									return Command.SINGLE_SUCCESS;
 								}))
 						)
-				.then(ClientCommandManager.literal("toggleSendPacketsInChat")
+				.then(ClientCommands.literal("toggleSendPacketsInChat")
 						.executes(context -> {
 							sendPacketsInChat = true;
 
@@ -83,7 +83,7 @@ private static void logPacket(HypixelS2CPacket packet) {
 		LOGGER.info("[HM API] Received Packet: {}", packet);
 
 		if (player != null && sendPacketsInChat) {
-			player.displayClientMessage(Component.nullToEmpty(packet.toString()), false);
+			player.sendSystemMessage(Component.nullToEmpty(packet.toString()));
 		}
 	}
 }

src/main/resources/fabric.mod.json

@@ -27,9 +27,9 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.18.4",
-		"minecraft": "~1.21.11",
-		"java": ">=21",
-		"fabric-api": ">=0.140.0+1.21.11"
+		"minecraft": "~26.1-",
+		"java": ">=25",
+		"fabric-api": ">=0.142.1+26.1"
 	},
 	"custom": {
 		"modmenu": {

src/test/java/net/azureaaron/hmapi/network/packet/c2s/RegisterC2SPacketTest.java

@@ -7,7 +7,7 @@
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.azureaaron.hmapi.network.packet.v1.s2c.LocationUpdateS2CPacket;
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -26,8 +26,8 @@ public static void setupEnvironment() {
 
 	@Test
 	void testSerializeByteBuf() {
-		RegistryFriendlyByteBuf expected = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
-		RegistryFriendlyByteBuf actual = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf expected = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
+		RegistryFriendlyByteBuf actual = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		Object2IntMap<Identifier> wantedPackets = Util.make(new Object2IntOpenHashMap<>(), map -> map.put(LocationUpdateS2CPacket.ID.id(), 1));
 

src/test/java/net/azureaaron/hmapi/network/packet/s2c/ErrorS2CPacketTest.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 
 import net.azureaaron.hmapi.data.error.ModApiErrorReason;
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -21,7 +21,7 @@ public static void setupEnvironment() {
 
 	@Test
 	void testDeserializeByteBuf() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		buf.writeVarInt(2);
 

src/test/java/net/azureaaron/hmapi/network/packet/s2c/HelloS2CPacketTest.java

@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 
 import net.azureaaron.hmapi.data.server.Environment;
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -21,7 +21,7 @@ public static void setupEnvironment() {
 
 	@Test
 	void testDeserializeByteBuf() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		buf.writeVarInt(0);
 

src/test/java/net/azureaaron/hmapi/network/packet/v1/s2c/DispatchedCodecPacketTest.java

@@ -14,7 +14,7 @@
 import net.azureaaron.hmapi.network.packet.s2c.ErrorS2CPacket;
 import net.azureaaron.hmapi.network.packet.s2c.HypixelS2CPacket;
 import net.azureaaron.hmapi.utils.PacketCodecUtils;
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.FriendlyByteBuf;
@@ -33,7 +33,7 @@ public static void setupEnvironment() {
 
 	@Test
 	void testNormalPacket() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		buf.writeBoolean(true)
 		.writeVarInt(1)
@@ -53,7 +53,7 @@ void testNormalPacket() {
 
 	@Test
 	void testUnknownVersionPacket() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		buf.writeBoolean(true)
 		.writeVarInt(256);
@@ -65,7 +65,7 @@ void testUnknownVersionPacket() {
 
 	@Test
 	void testErrorPacket() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		buf.writeBoolean(false)
 		.writeVarInt(2);

src/test/java/net/azureaaron/hmapi/network/packet/v1/s2c/LocationUpdateS2CPacketTest.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.FriendlyByteBuf;
@@ -23,7 +23,7 @@ public static void setupEnvironment() {
 
 	@Test
 	void testDeserializeByteBuf() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		buf.writeUtf("mini88H")
 		.writeOptional(Optional.of("SKYBLOCK"), FriendlyByteBuf::writeUtf);

src/test/java/net/azureaaron/hmapi/network/packet/v1/s2c/PlayerInfoS2CPacketTest.java

@@ -9,7 +9,7 @@
 import net.azureaaron.hmapi.data.rank.MonthlyPackageRank;
 import net.azureaaron.hmapi.data.rank.PackageRank;
 import net.azureaaron.hmapi.data.rank.PlayerRank;
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.FriendlyByteBuf;
@@ -26,7 +26,7 @@ public static void setupEnvironment() {
 
 	@Test
 	void testDeserializeByteBuf() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 
 		buf.writeVarInt(1)
 		.writeVarInt(5)

src/test/java/net/azureaaron/hmapi/network/packet/v2/s2c/PartyInfoS2CPacketTest.java

@@ -9,7 +9,7 @@
 
 import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
 import net.azureaaron.hmapi.data.party.PartyRole;
-import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.UUIDUtil;
@@ -29,7 +29,7 @@ public static void setupEnvironment() {
 
 	@Test
 	void testDeserializeByteBuf() {
-		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(PacketByteBufs.create());
+		RegistryFriendlyByteBuf buf = RegistryFriendlyByteBuf.decorator(RegistryAccess.EMPTY).apply(FriendlyByteBufs.create());
 		XoroshiroRandomSource rand = new XoroshiroRandomSource(0x88888888L);
 
 		Map<UUID, PartyRole> members = Util.make(new Object2ReferenceOpenHashMap<>(), map -> {