Skip to content

Commit 639dcf0

Browse files
committed
Fix Mekanism Tools not using configs and missing some tags
1 parent 24174c0 commit 639dcf0

File tree

62 files changed

+553
-872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+553
-872
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ minecraft_version=1.20.6
88
previous_minecraft_version=1.20.1
99
previous_minor_minecraft_version=1.20.4
1010
loader_version_range=[2,)
11-
forge_version=20.6.31-beta
11+
forge_version=20.6.42-beta
1212
mod_version=10.5.20
1313
#This determines the minimum version of forge required to use Mekanism
1414
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
15-
forge_version_range=[20.6.23-beta,)
15+
forge_version_range=[20.6.41-beta,)
1616
minecraft_version_range=[1.20.6]
1717
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1818
# options are: alpha, beta, release

src/additions/java/mekanism/additions/common/MekanismAdditions.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import net.neoforged.fml.config.ModConfig;
3030
import net.neoforged.fml.event.config.ModConfigEvent;
3131
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
32+
import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
3233
import net.neoforged.neoforge.common.NeoForge;
3334
import net.neoforged.neoforge.event.server.ServerStartingEvent;
3435
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
@@ -53,7 +54,8 @@ public class MekanismAdditions implements IModModule {
5354

5455
public MekanismAdditions(ModContainer modContainer, IEventBus modEventBus) {
5556
Mekanism.addModule(instance = this);
56-
MekanismAdditionsConfig.registerConfigs(modContainer);
57+
//Ensure that configs don't get added or early initialized in an async way
58+
modEventBus.addListener(FMLConstructModEvent.class, event -> event.enqueueWork(() -> MekanismAdditionsConfig.registerConfigs(modContainer)));
5759
NeoForge.EVENT_BUS.addListener(this::serverStarting);
5860
NeoForge.EVENT_BUS.addListener(this::serverStopping);
5961

src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismtools/.cache/74946afffd5717edd09cca189d3cabba428fcf6f

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismtools/data/mekanismtools/tags/blocks/incorrect_for_bronze_tool.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismtools/data/mekanismtools/tags/blocks/incorrect_for_lapis_lazuli_tool.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismtools/data/mekanismtools/tags/blocks/incorrect_for_osmium_tool.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismtools/data/mekanismtools/tags/blocks/incorrect_for_refined_glowstone_tool.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)