update to 1.21.9

Author: moehreag

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
-	id 'io.freefair.lombok' version '8.13'
+	id 'io.freefair.lombok' version '9.0.+'
 	id 'com.modrinth.minotaur' version '2.+'
 }
 
@@ -41,11 +41,10 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modImplementation(include("io.github.axolotlclient:AxolotlClient-config:3.0.9+1.21.6"))
-	modImplementation("io.github.axolotlclient.AxolotlClient-config:AxolotlClientConfig-common:3.0.9")
+	modImplementation(include("io.github.axolotlclient:AxolotlClient-config:3.0.20+1.21.9"))
+	modImplementation("io.github.axolotlclient.AxolotlClient-config:AxolotlClientConfig-common:3.0.20")
 
-	//modLocalRuntime("com.terraformersmc:modmenu:14.0.0-rc.2")
-	
+	modLocalRuntime("com.terraformersmc:modmenu:16.0.0-rc.1")
 }
 
 processResources {

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.6
-parchment_minecraft=1.21.5
-parchment=2025.06.15
-loader_version=0.16.14
+minecraft_version=1.21.9
+parchment_minecraft=1.21.8
+parchment=2025.07.18
+loader_version=0.17.2
 
 # Mod Properties
 mod_version=1.1.1
 maven_group=io.github.moehreag
 archives_base_name=random-world-names
 
 # Dependencies
-fabric_version=0.127.0+1.21.6
+fabric_version=0.134.0+1.21.9

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/io/github/moehreag/randomworldnames/RandomWorldNames.java

@@ -8,7 +8,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
@@ -24,13 +23,11 @@
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.StringOption;
 import lombok.Getter;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener;
+import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.util.RandomSource;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -69,53 +66,42 @@ public void onInitializeClient() {
 		var configManager = new JsonConfigManager(FabricLoader.getInstance().getConfigDir().resolve(MODID + ".json"), category);
 		AxolotlClientConfig.getInstance().register(configManager);
 		configManager.load();
-		ResourceManagerHelper.get(PackType.CLIENT_RESOURCES)
-				.registerReloadListener(new SimpleResourceReloadListener<List<String>>() {
-					@Override
-					public ResourceLocation getFabricId() {
-						return rl("name-reloader");
-					}
-
-					@Override
-					public CompletableFuture<List<String>> load(ResourceManager resourceManager, Executor executor) {
-						return CompletableFuture.supplyAsync(() -> {
-							var blacklist = resourceManager.getResourceStack(BLACKLIST_LOCATION)
-									.stream().map(resource -> {
-										try {
-											return GSON.fromJson(resource.openAsReader(), String[].class);
-										} catch (IOException e) {
-											log.warn("Failed to load world names from {}: ", resource.sourcePackId(), e);
-											return null;
-										}
-									}).filter(Objects::nonNull)
-									.flatMap(Arrays::stream)
-									.toList();
-							return resourceManager.getResourceStack(NAME_LOCATION)
-									.stream().map(resource -> {
-										if (blacklist.contains(resource.sourcePackId())) {
-											log.info("Skipping names from blacklisted pack: {}", resource.sourcePackId());
-											return null;
-										}
-										try {
-											return GSON.fromJson(resource.openAsReader(), String[].class);
-										} catch (IOException e) {
-											log.warn("Failed to load world names from {}: ", resource.sourcePackId(), e);
-											return null;
-										}
-									}).filter(Objects::nonNull)
-									.flatMap(Arrays::stream)
-									.toList();
-						}, executor);
-					}
-
-					@Override
-					public CompletableFuture<Void> apply(List<String> o, ResourceManager resourceManager, Executor executor) {
-						return CompletableFuture.runAsync(() -> {
-							worldNames.clear();
-							worldNames.addAll(o);
-							log.info("Loaded {} names for random world names!", o.size());
-						}, executor);
-					}
+		ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloader(rl("name-reloader"),
+				(sharedState, executor, preparationBarrier, executor2) -> {
+					var resourceManager = sharedState.resourceManager();
+					return CompletableFuture.supplyAsync(() -> {
+								var blacklist = resourceManager.getResourceStack(BLACKLIST_LOCATION)
+										.stream().map(resource -> {
+											try {
+												return GSON.fromJson(resource.openAsReader(), String[].class);
+											} catch (IOException e) {
+												log.warn("Failed to load world names from {}: ", resource.sourcePackId(), e);
+												return null;
+											}
+										}).filter(Objects::nonNull)
+										.flatMap(Arrays::stream)
+										.toList();
+								return resourceManager.getResourceStack(NAME_LOCATION)
+										.stream().map(resource -> {
+											if (blacklist.contains(resource.sourcePackId())) {
+												log.info("Skipping names from blacklisted pack: {}", resource.sourcePackId());
+												return null;
+											}
+											try {
+												return GSON.fromJson(resource.openAsReader(), String[].class);
+											} catch (IOException e) {
+												log.warn("Failed to load world names from {}: ", resource.sourcePackId(), e);
+												return null;
+											}
+										}).filter(Objects::nonNull)
+										.flatMap(Arrays::stream)
+										.toList();
+							}, executor).thenCompose(preparationBarrier::wait)
+							.thenAcceptAsync(o -> {
+								worldNames.clear();
+								worldNames.addAll(o);
+								log.info("Loaded {} names for random world names!", o.size());
+							}, executor2);
 				});
 	}
 
@@ -146,12 +132,12 @@ private String generateRandomName() throws TimeoutException, LimitExceededExcept
 		}
 		CompletableFuture.runAsync(() -> {
 			try {
-				Thread.sleep(timeout.get()*1000);
+				Thread.sleep(timeout.get() * 1000);
 			} catch (InterruptedException ignored) {
 			}
 			timeoutReached.set(true);
 		});
-		double maxCombinations = Math.pow(nameLength.get(), limit+1);
+		double maxCombinations = Math.pow(nameLength.get(), limit + 1);
 		for (int total = 0; total < maxCombinations; total++) {
 			if (timeoutReached.get()) {
 				throw new TimeoutException("Generation timeout reached.");

src/main/resources/fabric.mod.json

@@ -25,7 +25,7 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.14.3",
-		"minecraft": ">=1.21.2",
+		"minecraft": ">=1.21.7",
 		"java": ">=21",
 		"fabric-api": "*"
 	},