From dd87393034e96f00466b7a8c4ac61ffa81f60fde Mon Sep 17 00:00:00 2001 From: Elizabeth Urquhart Date: Sun, 16 Feb 2025 23:45:18 +1300 Subject: [PATCH] chore: update to Architectury API 15.0.2 Needed to update `ReloadListenerRegistry.register` calls due to https://github.com/architectury/architectury-api/pull/603 --- gradle.properties | 2 +- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 2 +- .../src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java | 2 +- .../rei/impl/client/gui/widget/CachedEntryListRender.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index fbce35e45..dbbd8ecbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,6 @@ 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..d6772dc52 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" 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 void onInitialize() { 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 Sprite(float u0, float u1, float v0, float v1) { 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() {