Skip to content

Commit b3ab92a

Browse files
dima-dencepSu5eD
andauthored
Fix loading on servers (Sinytra#1419)
* Fix loading on servers * Fix running without FFAPI, bump NF --------- Co-authored-by: Su5eD <[email protected]>
1 parent 0b2b43c commit b3ab92a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ versionAdapterDefinition=1.13.21+1.21.1
1313
versionAdapterRuntime=1.0.0+1.21.1
1414

1515
versionMc=1.21.1
16-
versionNeoForge=21.1.5
16+
versionNeoForge=21.1.57
1717
versionParchmentMc=1.21
1818
versionParchment=2024.07.28
1919
versionForgeAutoRenamingTool=1.0.12
2020
versionForgifiedFabricLoader=2.5.33+0.16.0+1.21.1
2121
versionAccessWidener=2.1.0
22-
versionForgifiedFabricApi=0.102.0+2.0.11+1.21.1
22+
versionForgifiedFabricApi=0.104.0+2.0.13+1.21.1
2323

2424
# Publishing
2525
curseForgeId=890127

src/main/java/org/sinytra/connector/transformer/jar/JarTransformInstance.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private static void processGeneratedJar(File input, Path output, Stopwatch stopw
179179
private static ClassLookup createCleanClassLookup() {
180180
String mcAndNeoFormVersion = FMLLoader.versionInfo().mcAndNeoFormVersion();
181181
if (FMLEnvironment.production) {
182-
MavenCoordinate coords = new MavenCoordinate("net.minecraft", "client", "", "srg", mcAndNeoFormVersion);
182+
MavenCoordinate coords = new MavenCoordinate("net.minecraft", FMLEnvironment.dist.isClient() ? "client" : "server", "", "srg", mcAndNeoFormVersion);
183183
Path path = LibraryFinder.findPathForMaven(coords);
184184
if (!Files.exists(path)) {
185185
throw new ModLoadingException(ModLoadingIssue.error("fml.modloadingissue.corrupted_installation").withAffectedPath(path));

src/mod/java/org/sinytra/connector/mod/mixin/registries/RegistryDataLoaderMixin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public abstract class RegistryDataLoaderMixin {
1919
// https://github.com/quiqueck/WorldWeaver/blob/8861dbf39c85cdafbaf2caab1783d11c26d78f44/wover-core-api/src/main/java/org/betterx/wover/core/mixin/registry/RegistryDataLoaderMixin.java#L28
2020
@Inject(method = "<clinit>", at = @At("TAIL"))
2121
private static void postInitLast(CallbackInfo ci) {
22-
if (RegistryDataLoader.WORLDGEN_REGISTRIES.size() != DataPackRegistriesHooks.getDataPackRegistries().size()) {
22+
if (DataPackRegistriesHooks.getDataPackRegistries() != null && RegistryDataLoader.WORLDGEN_REGISTRIES.size() != DataPackRegistriesHooks.getDataPackRegistries().size()) {
2323
ConnectorMod.LOGGER.info("Detected changes in WORLDGEN_REGISTRIES, updating NeoForge references");
2424
List<RegistryDataLoader.RegistryData<?>> list = new ArrayList<>(RegistryDataLoader.WORLDGEN_REGISTRIES);
2525
DataPackRegistriesHooksAccessor.set_DATA_PACK_REGISTRIES(list);

0 commit comments

Comments
 (0)