diff --git a/energy-bridge/build.gradle.kts b/energy-bridge/build.gradle.kts index f5c1e00..6444788 100644 --- a/energy-bridge/build.gradle.kts +++ b/energy-bridge/build.gradle.kts @@ -6,9 +6,9 @@ repositories { } dependencies { - implementation("org.sinytra:forgified-fabric-loader:2.5.84+0.19.3+26.1.2") - implementation("org.sinytra.forgified-fabric-api:fabric-api-lookup-api-v1:2.0.12+29e133704c") - implementation("org.sinytra.forgified-fabric-api:fabric-transfer-api-v1:8.0.6+7b5559184c") + implementation("org.sinytra:forgified-fabric-loader:2.5.90+0.19.5+26.1.2") + implementation("org.sinytra.forgified-fabric-api:fabric-api-lookup-api-v1:2.0.18+5f5192e39e") + implementation("org.sinytra.forgified-fabric-api:fabric-transfer-api-v1:8.0.13+d6727f829e") implementation("teamreborn:energy:5.0.0") { isTransitive = false diff --git a/energy-bridge/src/main/resources/META-INF/neoforge.mods.toml b/energy-bridge/src/main/resources/META-INF/neoforge.mods.toml index 60409ba..27c3beb 100644 --- a/energy-bridge/src/main/resources/META-INF/neoforge.mods.toml +++ b/energy-bridge/src/main/resources/META-INF/neoforge.mods.toml @@ -22,6 +22,6 @@ A bridge between Forge Energy (FE) and Team Reborn's Energy API (E) that allows [[dependencies.connectorextras_energy_bridge]] modId="minecraft" type="required" - versionRange="[26.1,26.2)" + versionRange="[26.2,26.3)" ordering="NONE" side="BOTH" diff --git a/forgeconfigapiport/build.gradle.kts b/forgeconfigapiport/build.gradle.kts index d52a1b0..123b713 100644 --- a/forgeconfigapiport/build.gradle.kts +++ b/forgeconfigapiport/build.gradle.kts @@ -6,7 +6,7 @@ repositories { } dependencies { - implementation("org.sinytra.forgified-fabric-api:fabric-api-base:2.0.3+b11575294c") + implementation("org.sinytra.forgified-fabric-api:fabric-api-base:2.0.4+d41ec0009e") jarJar(implementation("fuzs.forgeconfigapiport:forgeconfigapiport-common-forgeapi:26.1.5") { version { diff --git a/forgeconfigapiport/src/main/resources/META-INF/neoforge.mods.toml b/forgeconfigapiport/src/main/resources/META-INF/neoforge.mods.toml index 6b756de..baa06d0 100644 --- a/forgeconfigapiport/src/main/resources/META-INF/neoforge.mods.toml +++ b/forgeconfigapiport/src/main/resources/META-INF/neoforge.mods.toml @@ -28,6 +28,6 @@ Provides compat for Forge Config API Port (Fabric) [[dependencies.connectorextras_forgeconfigapiport]] modId="minecraft" type="required" - versionRange="[26.1,26.2)" + versionRange="[26.2,26.3)" ordering="NONE" side="BOTH" diff --git a/gradle.properties b/gradle.properties index ef61bf2..d6d673f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ org.gradle.caching=true # Versions versionConnectorExtras=2.0.3 -versionMc=26.1.2 -versionNeoForge=26.1.2.94 +versionMc=26.2 +versionNeoForge=26.2.0.88 # Publishing curseForgeId=913445 diff --git a/jei-bridge/build.gradle.kts b/jei-bridge/build.gradle.kts index ba00f94..d353b10 100644 --- a/jei-bridge/build.gradle.kts +++ b/jei-bridge/build.gradle.kts @@ -3,9 +3,9 @@ repositories { } dependencies { - implementation("org.sinytra:forgified-fabric-loader:2.5.84+0.19.3+26.1.2") - implementation("org.sinytra.forgified-fabric-api:fabric-api-lookup-api-v1:2.0.12+29e133704c") - implementation("org.sinytra.forgified-fabric-api:fabric-transfer-api-v1:8.0.6+6fa9936c4c") + implementation("org.sinytra:forgified-fabric-loader:2.5.90+0.19.5+26.1.2") + implementation("org.sinytra.forgified-fabric-api:fabric-api-lookup-api-v1:2.0.18+5f5192e39e") + implementation("org.sinytra.forgified-fabric-api:fabric-transfer-api-v1:8.0.13+d6727f829e") implementation("mezz.jei:jei-26.1.2-neoforge:29.6.2.38") } diff --git a/jei-bridge/src/main/resources/META-INF/neoforge.mods.toml b/jei-bridge/src/main/resources/META-INF/neoforge.mods.toml index 4499109..b26210d 100644 --- a/jei-bridge/src/main/resources/META-INF/neoforge.mods.toml +++ b/jei-bridge/src/main/resources/META-INF/neoforge.mods.toml @@ -25,6 +25,6 @@ config="mixins.jeibridge.json" [[dependencies.connectorextras_jei_bridge]] modId="minecraft" type="required" - versionRange="[26.1,26.2)" + versionRange="[26.2,26.3)" ordering="NONE" side="BOTH" diff --git a/modmenu-bridge/build.gradle.kts b/modmenu-bridge/build.gradle.kts index 5410d3c..cbda49e 100644 --- a/modmenu-bridge/build.gradle.kts +++ b/modmenu-bridge/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - implementation("org.sinytra:forgified-fabric-loader:2.5.84+0.19.3+26.1.2") + implementation("org.sinytra:forgified-fabric-loader:2.5.90+0.19.5+26.1.2") } diff --git a/modmenu-bridge/src/main/java/com/terraformersmc/modmenu/api/ModMenuApi.java b/modmenu-bridge/src/main/java/com/terraformersmc/modmenu/api/ModMenuApi.java index c63c0e0..4734e3c 100644 --- a/modmenu-bridge/src/main/java/com/terraformersmc/modmenu/api/ModMenuApi.java +++ b/modmenu-bridge/src/main/java/com/terraformersmc/modmenu/api/ModMenuApi.java @@ -25,7 +25,7 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; -import net.neoforged.neoforge.client.gui.ModListScreen; +import net.neoforged.neoforge.client.gui.modlist.ModListScreen; import java.util.Map; import java.util.function.Consumer; @@ -40,7 +40,7 @@ public interface ModMenuApi { * @return A "Mods" Screen */ static Screen createModsScreen(Screen previous) { - return new ModListScreen(previous); + return ModListScreen.create(previous); } /** diff --git a/modmenu-bridge/src/main/java/org/sinytra/connectorextras/modmenu/ModMenuCompatSetup.java b/modmenu-bridge/src/main/java/org/sinytra/connectorextras/modmenu/ModMenuCompatSetup.java index f0b224b..110c0a5 100644 --- a/modmenu-bridge/src/main/java/org/sinytra/connectorextras/modmenu/ModMenuCompatSetup.java +++ b/modmenu-bridge/src/main/java/org/sinytra/connectorextras/modmenu/ModMenuCompatSetup.java @@ -7,7 +7,7 @@ import net.minecraft.client.gui.screens.Screen; import net.neoforged.fml.ModList; import net.neoforged.neoforge.client.gui.IConfigScreenFactory; -import net.neoforged.neoforge.client.gui.ModListScreen; +import net.neoforged.neoforge.client.gui.modlist.ModListScreen; import org.slf4j.Logger; import java.util.ArrayList; @@ -35,7 +35,7 @@ public static void init() { providedFactories.forEach(map -> map.forEach(modFactories::putIfAbsent)); providedFactories.clear(); - Screen dummyParent = new ModListScreen(null); + Screen dummyParent = ModListScreen.create(null); modFactories.forEach((modId, factory) -> { // Ensure factory is active. This is required to avoid cases where the integration conditionally // disables itself (e.g. when cloth config is absent) and returns a dummy factory. diff --git a/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml b/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml index 5d798ad..34639fc 100644 --- a/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml +++ b/modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml @@ -33,6 +33,6 @@ config="mixins.connectorextras_modmenu_bridge.json" [[dependencies.connectorextras_modmenu_bridge]] modId="minecraft" type="required" - versionRange="[26.1,26.2)" + versionRange="[26.2,26.3)" ordering="NONE" side="BOTH" diff --git a/rei-bridge/build.gradle.kts b/rei-bridge/build.gradle.kts index 029cb7e..6f9e073 100644 --- a/rei-bridge/build.gradle.kts +++ b/rei-bridge/build.gradle.kts @@ -3,9 +3,9 @@ repositories { } dependencies { - implementation("org.sinytra:forgified-fabric-loader:2.5.84+0.19.3+26.1.2") - implementation("org.sinytra.forgified-fabric-api:fabric-api-lookup-api-v1:2.0.12+29e133704c") - implementation("org.sinytra.forgified-fabric-api:fabric-transfer-api-v1:8.0.6+7b5559184c") + implementation("org.sinytra:forgified-fabric-loader:2.5.90+0.19.5+26.1.2") + implementation("org.sinytra.forgified-fabric-api:fabric-api-lookup-api-v1:2.0.18+5f5192e39e") + implementation("org.sinytra.forgified-fabric-api:fabric-transfer-api-v1:8.0.13+d6727f829e") implementation("me.shedaniel:RoughlyEnoughItems-neoforge:26.1.819") runtimeOnly("dev.architectury:architectury-neoforge:20.0.7") diff --git a/rei-bridge/src/main/resources/META-INF/neoforge.mods.toml b/rei-bridge/src/main/resources/META-INF/neoforge.mods.toml index eb495e0..fccc9cb 100644 --- a/rei-bridge/src/main/resources/META-INF/neoforge.mods.toml +++ b/rei-bridge/src/main/resources/META-INF/neoforge.mods.toml @@ -25,6 +25,6 @@ config="mixins.reibridge.json" [[dependencies.connectorextras_rei_bridge]] modId="minecraft" type="required" - versionRange="[26.1,26.2)" + versionRange="[26.2,26.3)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 9f06f3d..3471cb7 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -22,7 +22,7 @@ Integrating Connector with third-party APIs [[dependencies.connectorextras]] modId="minecraft" type="required" - versionRange="[26.1,26.2)" + versionRange="[26.2,26.3)" ordering="NONE" side="BOTH" [[dependencies.connectorextras_kubejs_bridge]] diff --git a/terrablender-bridge/build.gradle.kts b/terrablender-bridge/build.gradle.kts index 3983381..5a413d4 100644 --- a/terrablender-bridge/build.gradle.kts +++ b/terrablender-bridge/build.gradle.kts @@ -5,7 +5,7 @@ repositories { dependencies { implementation(project(":extras-utils")) - implementation("org.sinytra:forgified-fabric-loader:2.5.84+0.19.3+26.1.2") + implementation("org.sinytra:forgified-fabric-loader:2.5.90+0.19.5+26.1.2") implementation("com.github.glitchfiend:TerraBlender-neoforge:26.1.2-26.1.2.0.3") } diff --git a/terrablender-bridge/src/main/resources/META-INF/neoforge.mods.toml b/terrablender-bridge/src/main/resources/META-INF/neoforge.mods.toml index 34a9c9c..077dee4 100644 --- a/terrablender-bridge/src/main/resources/META-INF/neoforge.mods.toml +++ b/terrablender-bridge/src/main/resources/META-INF/neoforge.mods.toml @@ -22,6 +22,6 @@ Loads TerraBlender Fabric API entrypoints of Fabric mods on Forge. [[dependencies.connectorextras_terrablender_bridge]] modId="minecraft" type="required" - versionRange="[26.1,26.2)" + versionRange="[26.2,26.3)" ordering="NONE" side="BOTH"