From ce2de8d07e696b5ef75f2decbd6961286d88fb4f Mon Sep 17 00:00:00 2001 From: ellellie Date: Mon, 17 Feb 2025 00:49:06 +1300 Subject: chore: Update to add namespaces to ReloadListenerRegistry calls (#1828) * chore: update to Architectury API 15.0.2 Needed to update `ReloadListenerRegistry.register` calls due to https://github.com/architectury/architectury-api/pull/603 * chore: add dependency on architectury >= 15.0.2 for the fabric platform. * chore: depend on NeoForge >= 21.4.84-beta as well --- fabric/src/main/resources/fabric.mod.json | 3 ++- gradle.properties | 4 ++-- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java | 2 +- .../shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index ab7aee27b..df868f9d8 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -119,6 +119,7 @@ } }, "depends": { - "minecraft": "~1.21-" + "minecraft": "~1.21-", + "architectury": ">=15.0.2" } } diff --git a/gradle.properties b/gradle.properties index fbce35e45..ef212bf62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,12 @@ supported_version=1.21.4 minecraft_version=1.21.4 platforms=fabric,neoforge forge_version=49.1.10 -neoforge_version=21.4.20-beta +neoforge_version=21.4.84-beta neoforge_pr= fabricloader_version=0.16.7 cloth_config_version=17.0.144 modmenu_version=11.0.0-rc.2 fabric_api=0.112.0+1.21.4 -architectury_version=15.0.1 +architectury_version=15.0.2 api_exculde= #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 6e372138b..7238a2790 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -16,7 +16,7 @@ To allow players to view items and recipes. [[dependencies.roughlyenoughitems]] modId = "architectury" type = "required" -versionRange = "[8,)" +versionRange = "[15.0.2,)" ordering = "NONE" side = "BOTH" @@ -30,7 +30,7 @@ side = "BOTH" [[dependencies.roughlyenoughitems]] modId = "neoforge" type = "required" -versionRange = "[21.0,)" +versionRange = "[21.4.84-beta,)" ordering = "NONE" side = "BOTH" diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index 8a31cb95a..6c9c62e79 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -157,7 +157,7 @@ public class RoughlyEnoughItemsCore { if (GameInstance.getServer() == null) return; ReloadManagerImpl.reloadPlugins(null, ReloadInterruptionContext.ofNever()); }, executor2); - }); + }, ResourceLocation.fromNamespaceAndPath("roughlyenoughitems", "reload_plugins")); } } diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java index 12196723f..78d3c19ba 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/CachedEntryListRender.java @@ -86,7 +86,7 @@ public class CachedEntryListRender { static { ReloadListenerRegistry.register(PackType.CLIENT_RESOURCES, (barrier, resourceManager, preparationExecutor, reloadExecutor) -> { return barrier.wait(Unit.INSTANCE).thenRunAsync(CachedEntryListRender::refresh, reloadExecutor); - }); + }, ResourceLocation.fromNamespaceAndPath("roughlyenoughitems", "cached_entries")); } public static void refresh() { -- cgit