Skip to content

Port to Minecraft 26.2, NeoForge 26.2.0.88 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thisismartin321 wants to merge 1 commit into from
Closed

Port to Minecraft 26.2, NeoForge 26.2.0.88 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions energy-bridge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion energy-bridge/src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion forgeconfigapiport/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion forgeconfigapiport/src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jei-bridge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
2 changes: 1 addition & 1 deletion jei-bridge/src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion modmenu-bridge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
4 changes: 2 additions & 2 deletions modmenu-bridge/src/main/java/com/terraformersmc/modmenu/api/ModMenuApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -40,7 +40,7 @@ public interface ModMenuApi {
* @return A "Mods" Screen
*/
static Screen createModsScreen(Screen previous) {
return new ModListScreen(previous);
return ModListScreen.create(previous);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions modmenu-bridge/src/main/java/org/sinytra/connectorextras/modmenu/ModMenuCompatSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion modmenu-bridge/src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions rei-bridge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion rei-bridge/src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
2 changes: 1 addition & 1 deletion terrablender-bridge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
2 changes: 1 addition & 1 deletion terrablender-bridge/src/main/resources/META-INF/neoforge.mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"