port: Now on 26.1!

Author: Ampflower

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
 
       - name: Setup Gradle

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 25
           distribution: 'temurin'
 
       - name: Setup Gradle

build.gradle

@@ -5,23 +5,26 @@ plugins {
 }
 
 version = "$baseVersion"
-archivesBaseName = project.slug
+
+base {
+	archivesName = project.slug
+}
 
 repositories {
 	maven {
-		url "https://maven.gegy.dev/"
+		url = "https://maven.gegy.dev/"
 		content {
 			includeGroupAndSubgroups("dev.gegy")
 		}
 	}
 	maven {
-		url "https://maven.nucleoid.xyz/"
+		url = "https://maven.nucleoid.xyz/"
 		content {
 			includeGroupAndSubgroups("xyz.nucleoid")
 		}
 	}
 	maven {
-		url "https://maven.theepicblock.nl/"
+		url = "https://maven.theepicblock.nl/"
 		content {
 			includeGroupAndSubgroups("nl.theepicblock")
 		}
@@ -46,27 +49,24 @@ configurations {
 
 dependencies {
 	minecraft libs.mc
-	mappings variantOf(libs.yarn) { classifier "v2" }
 
-	modImplementation libs.fl
-	modImplementation libs.fapi
-	modImplementation libs.playerrolesapi
-	modImplementation libs.playerroles
+	implementation libs.fl
+	implementation libs.fapi
+	implementation libs.playerrolesapi
+	implementation libs.playerroles
 
 	shadow libs.javasseclient
 	implementation libs.javasseclient
 }
 
+jar {
+	destinationDirectory = new java.io.File(project.buildFile, "devlibs")
+}
+
 var shadowJar = tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
 	configurations = [project.configurations.shadow]
-	destinationDirectory = tasks.named("jar").flatMap {it.destinationDirectory }
 	minimize()
-	enableRelocation = true
-	relocationPrefix = "net.modfest.rolesync"
-}
-
-remapJar {
-	inputFile = shadowJar.flatMap { it.archiveFile }
+	relocate("nl.theepicblock.sseclient", "net.modfest.rolesync.sseclient")
 }
 
 processResources {
@@ -91,18 +91,18 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
 	withSourcesJar()
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${archivesBaseName}" }
+		rename { "${it}_${base.archivesName.get()}" }
 	}
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

libs.versions.toml

@@ -1,22 +1,20 @@
 [versions]
-loom = "1.10.+"
-shadow = "8.3.6"
+loom = "1.15.+"
+shadow = "9.4.1"
 
-mc = "1.21.1"
-fl = "0.16.10"
-yarn = "1.21+build.9"
-fapi = "0.102.0+1.21"
-player-roles = "1.6.13"
-java-sse-client = "0.3.1"
+mc = "26.1"
+fl = "0.18.5"
+fapi = "0.144.4+26.1"
+player-roles = "1.9.0-pre.1"
+java-sse-client = "0.4.0"
 
 [plugins]
-loom = { id = "fabric-loom", version.ref = "loom" }
+loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow"}
 
 [libraries]
 mc = { group = "mojang", name = "minecraft", version.ref = "mc" }
 fl = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fl" }
-yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
 fapi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fapi" }
 playerroles = { group = "dev.gegy", name = "player-roles", version.ref = "player-roles" }
 playerrolesapi = { group = "dev.gegy", name = "player-roles-api", version.ref = "player-roles" }

src/main/java/net/modfest/rolesync/PlatformRoleLookup.java

@@ -1,15 +1,15 @@
 package net.modfest.rolesync;
 
 import dev.gegy.roles.api.Role;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.UUID;
 
 public interface PlatformRoleLookup {
 	PlatformRoleLookup EMPTY = new PlatformRoleLookup() {
 		@Override
-		public @Nullable Role getRole(PlayerEntity player) {
+		public @Nullable Role getRole(Player player) {
 			return null;
 		}
 
@@ -19,6 +19,6 @@ public interface PlatformRoleLookup {
 		}
 	};
 
-	@Nullable Role getRole(PlayerEntity player);
+	@Nullable Role getRole(Player player);
 	@Nullable Role getRoleUUID(UUID id);
 }

src/main/java/net/modfest/rolesync/TestLookup.java

@@ -2,7 +2,7 @@
 
 import dev.gegy.roles.api.PlayerRolesApi;
 import dev.gegy.roles.api.Role;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.UUID;
@@ -13,7 +13,7 @@ public TestLookup(String name) {
 	}
 
 	@Override
-	public @Nullable Role getRole(PlayerEntity player) {
+	public @Nullable Role getRole(Player player) {
 		return role;
 	}
 

src/main/java/net/modfest/rolesync/WrappedLookup.java

@@ -7,13 +7,17 @@
 import dev.gegy.roles.api.RoleReader;
 import dev.gegy.roles.api.override.RoleOverrideReader;
 import dev.gegy.roles.api.override.RoleOverrideType;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 import java.util.stream.Stream;
 
 /**
@@ -29,7 +33,7 @@ public WrappedLookup(RoleLookup root) {
 	}
 
 	@Override
-	public @NotNull RoleReader byPlayer(PlayerEntity player) {
+	public @NotNull RoleReader byPlayer(Player player) {
 		var additionalRole = this.platformLookup.getRole(player);
 		if (additionalRole != null) {
 			return new MergedRoleReader(additionalRole, root.byPlayer(player));
@@ -39,7 +43,7 @@ public WrappedLookup(RoleLookup root) {
 
 	@Override
 	public @NotNull RoleReader byEntity(Entity entity) {
-		if (entity instanceof PlayerEntity player) {
+		if (entity instanceof Player player) {
 			var additionalRole = this.platformLookup.getRole(player);
 			if (additionalRole != null) {
 				return new MergedRoleReader(additionalRole, root.byEntity(entity));
@@ -49,9 +53,9 @@ public WrappedLookup(RoleLookup root) {
 	}
 
 	@Override
-	public @NotNull RoleReader bySource(ServerCommandSource serverCommandSource) {
+	public @NotNull RoleReader bySource(CommandSourceStack serverCommandSource) {
 		var entity = serverCommandSource.getEntity();
-		if (entity instanceof PlayerEntity player) {
+		if (entity instanceof Player player) {
 			var additionalRole = this.platformLookup.getRole(player);
 			if (additionalRole != null) {
 				return new MergedRoleReader(additionalRole, root.byEntity(entity));

src/main/java/net/modfest/rolesync/cache/CacheManager.java

@@ -4,15 +4,27 @@
 import com.google.common.hash.HashingInputStream;
 import com.google.common.hash.HashingOutputStream;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.util.Pair;
+import net.minecraft.util.Tuple;
 import net.modfest.rolesync.ModFestRoleSync;
 import net.modfest.rolesync.SyncedRole;
 import org.jspecify.annotations.NonNull;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -23,7 +35,7 @@ public class CacheManager {
 	private static final long MAGIC = 0xBEBE220da001BEBEL;
 	private final @NonNull Path location;
 	private byte[] hash;
-	private ReentrantLock writeLock = new ReentrantLock();
+	private final ReentrantLock writeLock = new ReentrantLock();
 
 	public CacheManager() {
 		this(FabricLoader.getInstance().getGameDir().resolve("platform_role_cache.bin"));
@@ -33,7 +45,7 @@ public CacheManager(@NonNull Path location) {
 		this.location = location;
 	}
 
-	public void read(Consumer<Stream<Pair<UUID,SyncedRole>>> onReadFinished) {
+	public void read(Consumer<Stream<Tuple<UUID,SyncedRole>>> onReadFinished) {
 		// No protection is needed against two threads reading at once. The callback already
 		// has locking and checks the time of each read
 		var readThread = new Thread(() -> {
@@ -47,7 +59,7 @@ public void read(Consumer<Stream<Pair<UUID,SyncedRole>>> onReadFinished) {
 					return;
 				}
 				var len = s.readInt();
-				var contents = new ArrayList<Pair<UUID,SyncedRole>>(len);
+				var contents = new ArrayList<Tuple<UUID,SyncedRole>>(len);
 
 				for (int i = 0; i < len; i++) {
 					var uuid = new UUID(s.readLong(), s.readLong());
@@ -57,7 +69,7 @@ public void read(Consumer<Stream<Pair<UUID,SyncedRole>>> onReadFinished) {
 						case 8 -> SyncedRole.PARTICIPANT;
 						default -> throw new IOException("Invalid role in cache");
 					};
-					contents.add(new Pair<>(uuid, role));
+					contents.add(new Tuple<>(uuid, role));
 				}
 				// We only set the hash and call the callback if we successfully read the whole file.
 				// It's possible for the file to be corrupt (especially since our writes aren't atomic),
@@ -77,7 +89,7 @@ public void read(Consumer<Stream<Pair<UUID,SyncedRole>>> onReadFinished) {
 		readThread.start();
 	}
 
-	public void write(Supplier<Stream<Pair<UUID,SyncedRole>>> provider) {
+	public void write(Supplier<Stream<Tuple<UUID,SyncedRole>>> provider) {
 		// Run on a separate thread to not bog down the server with IO
 		// This function should only be running whenever the server shuts down (or
 		// something in the configuration changes), so there's little performance concern
@@ -87,7 +99,7 @@ public void write(Supplier<Stream<Pair<UUID,SyncedRole>>> provider) {
 			try {
 				// Ensure the list is consistent by sorting it by uuid
 				var list = provider.get().collect(Collectors.toCollection(ArrayList::new));
-				list.sort(Comparator.comparing(Pair::getLeft));
+				list.sort(Comparator.comparing(Tuple::getA));
 				// We write the collection to a hashing output first, and we only save the file if
 				// the hash changes
 				var hash = Hashing.sha512();
@@ -117,14 +129,14 @@ public void write(Supplier<Stream<Pair<UUID,SyncedRole>>> provider) {
 		writeThread.start();
 	}
 
-	private void write(List<Pair<UUID,SyncedRole>> data, OutputStream stream) throws IOException {
+	private void write(List<Tuple<UUID,SyncedRole>> data, OutputStream stream) throws IOException {
 		var s = new DataOutputStream(stream);
 		s.writeLong(MAGIC);
 		s.writeInt(data.size());
 		for (var p : data) {
-			s.writeLong(p.getLeft().getMostSignificantBits());
-			s.writeLong(p.getLeft().getLeastSignificantBits());
-			s.writeByte(switch (p.getRight()) {
+			s.writeLong(p.getA().getMostSignificantBits());
+			s.writeLong(p.getA().getLeastSignificantBits());
+			s.writeByte(switch (p.getB()) {
 				case TEAM -> 1;
 				case PARTICIPANT -> 8;
 			});

src/main/java/net/modfest/rolesync/logging/CommandLogger.java

@@ -1,22 +1,22 @@
 package net.modfest.rolesync.logging;
 
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
 
-public record CommandLogger(ServerCommandSource source) implements MiniLogger {
+public record CommandLogger(CommandSourceStack source) implements MiniLogger {
 	@Override
 	public void error(String error) {
-		source.sendError(Text.literal(error));
+		source.sendFailure(Component.literal(error));
 	}
 
 	@Override
 	public void warn(String warning) {
-		source.sendError(Text.literal(warning).formatted(Formatting.YELLOW));
+		source.sendFailure(Component.literal(warning).withStyle(ChatFormatting.YELLOW));
 	}
 
 	@Override
 	public void info(String info) {
-		source.sendFeedback(() -> Text.literal(info), false);
+		source.sendSuccess(() -> Component.literal(info), false);
 	}
 }