Merge changes from v3.1.1 into v3.2.x.

Author: LambdAurora

CHANGELOG.md

@@ -202,6 +202,10 @@
 - Added settings access in Sodium.
 - Updated Simplified Chinese translations ([#242](https://github.com/LambdAurora/LambDynamicLights/pull/242)).
 
+### 3.1.1
+
+- Fixed in-world item light source data reload not applying.
+
 ## 3.2.0
 
 - Updated to Minecraft 1.21.2.
@@ -211,6 +215,11 @@
 - Updated Estonian translations ([#243](https://github.com/LambdAurora/LambDynamicLights/pull/243)).
 - Updated [SpruceUI].
 
+### 3.2.1
+
+- Same changes as v3.1.1 but for 1.21.3.
+- Fixed in-world item light source data reload not applying.
+
 [SpruceUI]: https://github.com/LambdAurora/SpruceUI "SpruceUI page"
 [pridelib]: https://github.com/Queerbric/pridelib "Pridelib page"
 [Sodium]: https://modrinth.com/mod/sodium "Sodium Modrinth page"

build_logic/src/main/kotlin/lambdynamiclights/Constants.kt

@@ -5,7 +5,7 @@ import org.gradle.accessors.dm.LibrariesForLibs
 object Constants {
 	const val GROUP = "dev.lambdaurora"
 	const val NAME = "lambdynamiclights"
-	const val VERSION = "3.2.0"
+	const val VERSION = "3.2.1"
 	const val JAVA_VERSION = 21
 
 	private var minecraftVersion: String? = null

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-minecraft = "1.21.2"
+minecraft = "1.21.3"
 fabric-loader = "0.16.7"
-fabric-api = "0.106.1+1.21.2"
-mappings-yalmm = "7"
+fabric-api = "0.106.1+1.21.3"
+mappings-yalmm = "1"
 mappings-parchment = "2024.07.28"
 
 # Dependencies

src/main/java/dev/lambdaurora/lambdynlights/LambDynLights.java

@@ -21,7 +21,6 @@
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.minecraft.client.Minecraft;
@@ -30,7 +29,6 @@
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.Identifier;
-import net.minecraft.resources.io.ResourceManager;
 import net.minecraft.resources.io.ResourceType;
 import net.minecraft.util.profiling.Profiler;
 import net.minecraft.world.entity.Entity;
@@ -56,7 +54,7 @@
  * Represents the LambDynamicLights mod.
  *
  * @author LambdAurora
- * @version 3.1.0
+ * @version 3.1.1
  * @since 1.0.0
  */
 public class LambDynLights implements ClientModInitializer {
@@ -84,17 +82,7 @@ public void onInitializeClient() {
 				.map(EntrypointContainer::getEntrypoint)
 				.forEach(initializer -> initializer.onInitializeDynamicLights(this.itemLightSources));
 
-		ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
-			@Override
-			public Identifier getFabricId() {
-				return Identifier.of(LambDynLightsConstants.NAMESPACE, "dynamiclights_resources");
-			}
-
-			@Override
-			public void reload(ResourceManager manager) {
-				LambDynLights.this.itemLightSources.load(manager);
-			}
-		});
+		ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(this.itemLightSources);
 
 		CommonLifecycleEvents.TAGS_LOADED.register((registries, client) -> {
 			this.itemLightSources.apply(registries);

src/main/java/dev/lambdaurora/lambdynlights/resource/item/ItemLightSources.java

@@ -15,11 +15,15 @@
 import com.mojang.serialization.DynamicOps;
 import com.mojang.serialization.JsonOps;
 import dev.lambdaurora.lambdynlights.LambDynLights;
+import dev.lambdaurora.lambdynlights.LambDynLightsConstants;
 import dev.lambdaurora.lambdynlights.api.item.ItemLightSource;
 import dev.lambdaurora.lambdynlights.api.item.ItemLightSourceManager;
 import dev.yumi.commons.TriState;
+import dev.yumi.commons.Unit;
 import dev.yumi.commons.event.Event;
+import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.RegistryOps;
@@ -34,25 +38,48 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 
 /**
  * Represents an item light sources manager.
  *
  * @author LambdAurora
- * @version 3.0.0
+ * @version 3.2.1
  * @since 1.3.0
  */
-public final class ItemLightSources implements ItemLightSourceManager {
+public final class ItemLightSources implements ItemLightSourceManager, IdentifiableResourceReloadListener {
 	private static final Logger LOGGER = LoggerFactory.getLogger("LambDynamicLights|ItemLightSources");
+	private static final Identifier RESOURCE_RELOADER_ID = Identifier.of(LambDynLightsConstants.NAMESPACE, "dynamiclights_resources");
 	private static final String SILENCE_ERROR_KEY = "silence_error";
 	private static final boolean FORCE_LOG_ERRORS = TriState.fromProperty("lambdynamiclights.resource.force_log_errors")
 			.toBooleanOrElse(FabricLoader.getInstance().isDevelopmentEnvironment());
 
 	private final Event<Identifier, OnRegister> onRegisterEvent = LambDynLights.EVENT_MANAGER.create(OnRegister.class);
+	private final Minecraft client = Minecraft.getInstance();
 
 	private final List<LoadedItemLightSource> loadedLightSources = new ArrayList<>();
 	private final List<ItemLightSource> lightSources = new ArrayList<>();
 
+	@Override
+	public Identifier getFabricId() {
+		return RESOURCE_RELOADER_ID;
+	}
+
+	@Override
+	public CompletableFuture<Void> reload(Synchronizer synchronizer, ResourceManager resourceManager, Executor prepareExecutor, Executor applyExecutor) {
+		return CompletableFuture.supplyAsync(() -> {
+					this.load(resourceManager);
+					return Unit.INSTANCE;
+				}, prepareExecutor)
+				.thenCompose(synchronizer::whenPrepared)
+				.thenAcceptAsync((reloadState) -> {
+					if (this.client.level != null) {
+						this.apply(this.client.level.registryAccess());
+					}
+				}, applyExecutor);
+	}
+
 	/**
 	 * Loads the item light source data from resource pack.
 	 *