FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-26 17:46:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix datagen failures not exiting with a none zero exit code. (#2141)

Browse source 
* Fix datagen failures not exiting with a none zero exit code.

* Checkstyle :)
This commit is contained in:
modmuss50 2022-04-17 19:24:06 +01:00
parent 7faf0d8813
commit e19de87d6a
2 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/FabricDataGenHelper.java
View file

@ -16,7 +16,6 @@
package net.fabricmc.fabric.impl.datagen; package net.fabricmc.fabric.impl.datagen;
import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
@ -24,12 +23,13 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import com.mojang.logging.LogUtils;
import com.mojang.serialization.Lifecycle; import com.mojang.serialization.Lifecycle;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.minecraft.data.server.AbstractTagProvider; import net.minecraft.data.server.AbstractTagProvider;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -92,7 +92,18 @@ public final class FabricDataGenHelper {
private FabricDataGenHelper() { private FabricDataGenHelper() {
} }
public static void run() throws IOException { public static void run() {
try {
runInternal();
} catch (Throwable t) {
LOGGER.error(LogUtils.FATAL_MARKER, "Failed to run data generation", t);
// Ensure we exit with a none zero exit code.
System.exit(-1);
}
}
private static void runInternal() {
Path outputDir = Paths.get(Objects.requireNonNull(OUTPUT_DIR, "No output dir provided with the 'fabric-api.datagen.output-dir' property")); Path outputDir = Paths.get(Objects.requireNonNull(OUTPUT_DIR, "No output dir provided with the 'fabric-api.datagen.output-dir' property"));
List<EntrypointContainer<DataGeneratorEntrypoint>> dataGeneratorInitializers = FabricLoader.getInstance() List<EntrypointContainer<DataGeneratorEntrypoint>> dataGeneratorInitializers = FabricLoader.getInstance()
@ -104,16 +115,23 @@ public final class FabricDataGenHelper {
} }
for (EntrypointContainer<DataGeneratorEntrypoint> entrypointContainer : dataGeneratorInitializers) { for (EntrypointContainer<DataGeneratorEntrypoint> entrypointContainer : dataGeneratorInitializers) {
final String id = entrypointContainer.getProvider().getMetadata().getId();
if (MOD_ID_FILTER != null) { if (MOD_ID_FILTER != null) {
if (!entrypointContainer.getProvider().getMetadata().getId().equals(MOD_ID_FILTER)) { if (!id.equals(MOD_ID_FILTER)) {
continue; continue;
} }
} }
LOGGER.info("Running data generator for {}", entrypointContainer.getProvider().getMetadata().getName()); LOGGER.info("Running data generator for {}", id);
FabricDataGenerator dataGenerator = new FabricDataGenerator(outputDir, entrypointContainer.getProvider(), STRICT_VALIDATION);
entrypointContainer.getEntrypoint().onInitializeDataGenerator(dataGenerator); try {
dataGenerator.run(); FabricDataGenerator dataGenerator = new FabricDataGenerator(outputDir, entrypointContainer.getProvider(), STRICT_VALIDATION);
entrypointContainer.getEntrypoint().onInitializeDataGenerator(dataGenerator);
dataGenerator.run();
} catch (Throwable t) {
throw new RuntimeException("Failed to run data generator from mod (%s)".formatted(id), t);
}
} }
} }

8
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/client/MinecraftClientMixin.java
View file

@ -30,13 +30,9 @@ public class MinecraftClientMixin {
@Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;getBackendDescription()Ljava/lang/String;")) @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;getBackendDescription()Ljava/lang/String;"))
private void main(CallbackInfo info) { private void main(CallbackInfo info) {
if (FabricDataGenHelper.ENABLED) { if (FabricDataGenHelper.ENABLED) {
try { FabricDataGenHelper.run();
FabricDataGenHelper.run();
} catch (Exception e) {
e.printStackTrace();
System.exit(-1);
}
// Exit gracefully.
System.exit(0); System.exit(0);
} }
} }