From a1c275df468e716cf4ad9496fc10b01811b7addd Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 21 May 2025 23:42:44 -0700 Subject: [PATCH] Deprecate GatherDataEvent.validate() as validation always happens. And made ExistingFileHelper always function. Closes #10516 --- patches/minecraft/net/minecraft/client/data/Main.java.patch | 2 +- patches/minecraft/net/minecraft/data/Main.java.patch | 2 +- .../net/minecraftforge/common/data/ExistingFileHelper.java | 5 ++--- .../java/net/minecraftforge/data/event/GatherDataEvent.java | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/data/Main.java.patch b/patches/minecraft/net/minecraft/client/data/Main.java.patch index 0d03bde7a5..bcf0229d80 100644 --- a/patches/minecraft/net/minecraft/client/data/Main.java.patch +++ b/patches/minecraft/net/minecraft/client/data/Main.java.patch @@ -15,7 +15,7 @@ boolean flag1 = flag || optionset.has(optionspec1); Bootstrap.bootStrap(); ClientBootstrap.bootstrap(); -+ if (!loader.run(optionset, path, input, flag, flag1, flag, flag, false)) ++ if (!loader.run(optionset, path, input, flag, flag1, flag, flag, true)) + return; DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true); addClientProviders(datagenerator, flag1); diff --git a/patches/minecraft/net/minecraft/data/Main.java.patch b/patches/minecraft/net/minecraft/data/Main.java.patch index e41cf571a1..a064ddb166 100644 --- a/patches/minecraft/net/minecraft/data/Main.java.patch +++ b/patches/minecraft/net/minecraft/data/Main.java.patch @@ -14,7 +14,7 @@ boolean flag2 = flag || optionset.has(optionspec2); boolean flag3 = flag || optionset.has(optionspec3); Collection collection = optionset.valuesOf(optionspec6).stream().map(p_129659_ -> Paths.get(p_129659_)).toList(); -+ if (!loader.run(optionset, path, collection, flag1, flag, flag2, flag3, false)) ++ if (!loader.run(optionset, path, collection, flag1, flag, flag2, flag3, true)) + return; DataGenerator datagenerator = new DataGenerator(path, SharedConstants.getCurrentVersion(), true); addServerProviders(datagenerator, collection, flag1, flag2, flag3); diff --git a/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java b/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java index 8692b35afd..716fb64748 100644 --- a/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java +++ b/src/main/java/net/minecraftforge/common/data/ExistingFileHelper.java @@ -159,9 +159,6 @@ public class ExistingFileHelper { * otherwise */ public boolean exists(ResourceLocation loc, PackType packType) { - if (!enable) { - return true; - } return generated.get(packType).contains(loc) || getManager(packType).getResource(loc).isPresent(); } @@ -261,7 +258,9 @@ public class ExistingFileHelper { /** * @return {@code true} if validation is enabled, {@code false} otherwise + * @deprecated Validation is always enabled, check things as you deem fit. */ + @Deprecated(forRemoval = true, since = "1.21.5") public boolean isEnabled() { return enable; } diff --git a/src/main/java/net/minecraftforge/data/event/GatherDataEvent.java b/src/main/java/net/minecraftforge/data/event/GatherDataEvent.java index 37a53c3482..6ac002cfd2 100644 --- a/src/main/java/net/minecraftforge/data/event/GatherDataEvent.java +++ b/src/main/java/net/minecraftforge/data/event/GatherDataEvent.java @@ -52,6 +52,7 @@ public final class GatherDataEvent extends Event implements IModBusEvent public boolean includeClient() { return this.config.client; } public boolean includeDev() { return this.config.dev; } public boolean includeReports() { return this.config.reports; } + @Deprecated(forRemoval = true, since = "1.21.5") // Validation is always enabled, check things as you deem fit. public boolean validate() { return this.config.validate; } public static final class DataGeneratorConfig { @@ -63,6 +64,7 @@ public final class GatherDataEvent extends Event implements IModBusEvent private final boolean client; private final boolean dev; private final boolean reports; + @Deprecated(forRemoval = true, since = "1.21.5") // Validation is always enabled, check things as you deem fit. private final boolean validate; private final boolean flat; private final List generators = new ArrayList<>();