Skip to content

Commit 603e3b3

Browse files
committed
fix: neoforge 26.1 AW
1 parent e7d0a49 commit 603e3b3

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,5 +196,14 @@ public List<RemappedJars> getRemappedJars() {
196196
);
197197
}
198198
}
199+
200+
@Override
201+
public List<MinecraftJar> getMinecraftJars() {
202+
if (minecraftProvider.isMergedNeoForgeJar()) {
203+
return List.of(getMergedJar(), getGameResourcesJar());
204+
} else {
205+
return List.of(getMergedJar(), getNeoForgeUniversalJar());
206+
}
207+
}
199208
}
200209
}

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MappedMinecraftProvider.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,5 @@ default MinecraftJar getGameResourcesJar() {
100100
default MinecraftJar getFMLJar() {
101101
return new MinecraftJar.FML(getJar(MinecraftJar.Type.FML));
102102
}
103-
104-
@Override
105-
default List<MinecraftJar> getMinecraftJars() {
106-
return List.of(getMergedJar());
107-
}
108103
}
109104
}

src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,5 +227,14 @@ public List<MinecraftJar.Type> getDependencyTypes() {
227227
return List.of(MinecraftJar.Type.MERGED, MinecraftJar.Type.NEOFORGE_UNIVERSAL);
228228
}
229229
}
230+
231+
@Override
232+
public List<MinecraftJar> getMinecraftJars() {
233+
if (minecraftProvider.isMergedNeoForgeJar()) {
234+
return List.of(getMergedJar(), getGameResourcesJar());
235+
} else {
236+
return List.of(getMergedJar(), getNeoForgeUniversalJar());
237+
}
238+
}
230239
}
231240
}

0 commit comments

Comments
 (0)