diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-11-14 02:36:33 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-11-14 02:36:33 +0800 |
| commit | 760f20e8bdf63ee4af47bb408cdac18e6dd7a591 (patch) | |
| tree | c82c23af4b13334723345612dc65f225f81cf5c3 /forge/src/main | |
| parent | 5b99b04e23728c32387183df3719b1f696e994fe (diff) | |
| parent | 57f59e7da8ae83f1ad952e410601409eecf2e1c4 (diff) | |
| download | RoughlyEnoughItems-760f20e8bdf63ee4af47bb408cdac18e6dd7a591.tar.gz RoughlyEnoughItems-760f20e8bdf63ee4af47bb408cdac18e6dd7a591.tar.bz2 RoughlyEnoughItems-760f20e8bdf63ee4af47bb408cdac18e6dd7a591.zip | |
Merge remote-tracking branch 'origin/6.x-1.17' into 7.x-1.18
# Conflicts:
# gradle.properties
Diffstat (limited to 'forge/src/main')
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java | 7 | ||||
| -rw-r--r-- | forge/src/main/resources/META-INF/mods.toml | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java index e6b2390db..8f67f2bff 100644 --- a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java +++ b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java @@ -29,6 +29,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fmllegacy.DatagenModLoader; import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.ModFileScanData; import org.apache.commons.lang3.tuple.ImmutableTriple; @@ -50,8 +51,10 @@ public class RoughlyEnoughItemsForge { public static final Logger LOGGER = LogManager.getFormatterLogger("REI"); public RoughlyEnoughItemsForge() { - RoughlyEnoughItemsInitializer.onInitialize(); - DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> RoughlyEnoughItemsInitializer::onInitializeClient); + if (!DatagenModLoader.isRunningDataGen()) { + RoughlyEnoughItemsInitializer.onInitialize(); + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> RoughlyEnoughItemsInitializer::onInitializeClient); + } } public static <A, T> void scanAnnotation(Class<A> clazz, Predicate<Class<T>> predicate, TriConsumer<List<String>, Supplier<T>, Class<T>> consumer) { diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index ba695b27f..160936ba0 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -31,6 +31,6 @@ side = "BOTH" [[dependencies.roughlyenoughitems]] modId = "cloth_config" mandatory = true -versionRange = "[5.0.36,)" +versionRange = "[5.1,)" ordering = "NONE" side = "BOTH" |