From 0decd04bc348f957ef94a9a4beba5e3f829da718 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Mon, 12 Aug 2024 22:48:07 +0200 Subject: Fix sodium reloadin [no changelog] --- .../firmament/features/texturepack/CustomBlockTextures.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/main/kotlin/moe/nea/firmament/features') diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt index c869ba4..18da54c 100644 --- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt +++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomBlockTextures.kt @@ -3,6 +3,7 @@ package moe.nea.firmament.features.texturepack import java.util.concurrent.CompletableFuture +import net.fabricmc.loader.api.FabricLoader import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable @@ -29,6 +30,7 @@ import net.minecraft.util.math.BlockPos import net.minecraft.util.profiler.Profiler import moe.nea.firmament.Firmament import moe.nea.firmament.annotations.Subscribe +import moe.nea.firmament.compat.SodiumChunkReloader import moe.nea.firmament.events.BakeExtraModelsEvent import moe.nea.firmament.events.EarlyResourceReloadEvent import moe.nea.firmament.events.FinalizeResourceManagerEvent @@ -161,10 +163,20 @@ object CustomBlockTextures { // false schedules rebuilds outside a 27 block radius to happen async it.scheduleRebuild(false) } + sodiumReloadTask?.run() } } } + private val sodiumReloadTask = runCatching { + SodiumChunkReloader() + }.getOrElse { + if (FabricLoader.getInstance().isModLoaded("sodium")) + logger.error("Could not create sodium chunk reloader") + null + } + + fun matchesPosition(replacement: BlockReplacement, blockPos: BlockPos?): Boolean { if (blockPos == null) return true val rc = replacement.roughCheck -- cgit