From c93a04a001b0f66b2724d46b04b6d1ed49a08d07 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Mon, 17 Nov 2025 19:55:02 +0100 Subject: refactor: port to mojmaps --- .../features/texturepack/CustomTextReplacements.kt | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomTextReplacements.kt') diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomTextReplacements.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomTextReplacements.kt index 8f7fc06..71617fd 100644 --- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomTextReplacements.kt +++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomTextReplacements.kt @@ -1,23 +1,23 @@ package moe.nea.firmament.features.texturepack -import net.minecraft.resource.ResourceManager -import net.minecraft.resource.SinglePreparationResourceReloader -import net.minecraft.text.Text -import net.minecraft.util.profiler.Profiler +import net.minecraft.server.packs.resources.ResourceManager +import net.minecraft.server.packs.resources.SimplePreparableReloadListener +import net.minecraft.network.chat.Component +import net.minecraft.util.profiling.ProfilerFiller import moe.nea.firmament.Firmament import moe.nea.firmament.annotations.Subscribe import moe.nea.firmament.events.FinalizeResourceManagerEvent import moe.nea.firmament.util.ErrorUtil.intoCatch -object CustomTextReplacements : SinglePreparationResourceReloader>() { +object CustomTextReplacements : SimplePreparableReloadListener>() { override fun prepare( - manager: ResourceManager, - profiler: Profiler + manager: ResourceManager, + profiler: ProfilerFiller ): List { - return manager.findResources("overrides/texts") { it.namespace == "firmskyblock" && it.path.endsWith(".json") } + return manager.listResources("overrides/texts") { it.namespace == "firmskyblock" && it.path.endsWith(".json") } .mapNotNull { - Firmament.tryDecodeJsonFromStream(it.value.inputStream) + Firmament.tryDecodeJsonFromStream(it.value.open()) .intoCatch("Failed to load text override from ${it.key}").orNull() } } @@ -25,20 +25,20 @@ object CustomTextReplacements : SinglePreparationResourceReloader = listOf() override fun apply( - prepared: List, - manager: ResourceManager, - profiler: Profiler + prepared: List, + manager: ResourceManager, + profiler: ProfilerFiller ) { this.textReplacers = prepared } @JvmStatic - fun replaceTexts(texts: List): List { + fun replaceTexts(texts: List): List { return texts.map { replaceText(it) } } @JvmStatic - fun replaceText(text: Text): Text { + fun replaceText(text: Component): Component { // TODO: add a config option for this val rawText = text.string var text = text @@ -51,6 +51,6 @@ object CustomTextReplacements : SinglePreparationResourceReloader