Skip to content

Commit db42748

Browse files
pupnewfsterpupnewfster
committed
Update deps and switch to using the new builtin system for defining startup configs
1 parent 75367fb commit db42748

File tree

11 files changed

+37
-69
lines changed

11 files changed

+37
-69
lines changed

‎build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ idea {
3535
module {
3636
//Exclude directories from being managed
3737
for (String excludeDirName : ['runs', 'out', 'logs', 'gradle']) {
38-
excludeDirs.add(new File(projectDir, excludeDirName))
38+
excludeDirs.add(file(excludeDirName))
3939
}
4040
//Tell IDEA to always download sources/javadoc artifacts from maven.
4141
downloadJavadoc = true
@@ -415,7 +415,7 @@ dependencies {
415415
localRuntime("curse.maven:jade-324717:${jade_id}")
416416
compileOnly("mcp.mobius.waila:wthit-api:neo-${wthit_version}")
417417

418-
def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${previous_minor_minecraft_version}:${crafttweaker_version}"
418+
def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${minecraft_version}:${crafttweaker_version}"
419419
compileOnly(crt)
420420
//TODO: Re-enable when it updates
421421
//localRuntime(crt)
@@ -433,7 +433,7 @@ dependencies {
433433
compileOnly("top.theillusivec4.curios:curios-neoforge:${curios_version}:api")
434434
compileOnly("com.blamejared.recipestages:RecipeStages:${recipe_stages_version}")
435435
compileOnly("curse.maven:opencomputers2-437654:${oc2_id}")
436-
compileOnly("cc.tweaked:cc-tweaked-1.20.5-forge-api:${cc_tweaked_version}")
436+
compileOnly("cc.tweaked:cc-tweaked-${minecraft_version}-forge-api:${cc_tweaked_version}")
437437
//localRuntime("cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cc_tweaked_version}")
438438
compileOnly("curse.maven:female-gender-forge-481655:${wildfire_gender_mod_id}")
439439

‎gradle.properties

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
22
# This is required to provide enough memory for the Minecraft decompilation process.
33
org.gradle.jvmargs=-Xmx4G
4+
#org.gradle.configuration-cache=true
45

56
java_version=21
67
minecraft_version=1.20.6
78
#Used as a helper for porting when deps we use have not updated yet
89
previous_minecraft_version=1.20.1
910
previous_minor_minecraft_version=1.20.4
1011
loader_version_range=[3,)
11-
forge_version=20.6.98-beta
12+
forge_version=20.6.104-beta
1213
mod_version=10.5.20
1314
#This determines the minimum version of forge required to use Mekanism
1415
# 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.94-beta,)
16+
forge_version_range=[20.6.104-beta,)
1617
minecraft_version_range=[1.20.6]
1718
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1819
# options are: alpha, beta, release
@@ -24,7 +25,7 @@ quicktheories_version=0.26
2425

2526
#NeoGradle Settings
2627
neogradle.subsystems.parchment.minecraftVersion=1.20.6
27-
neogradle.subsystems.parchment.mappingsVersion=2024.05.01
28+
neogradle.subsystems.parchment.mappingsVersion=2024.06.02
2829
neogradle.subsystems.conventions.sourcesets.enabled=false
2930

3031
#misc settings
@@ -35,13 +36,14 @@ recipe_viewer=emi
3536
yamlops_version=1.2.0
3637

3738
#Mod dependencies
38-
cc_tweaked_version=1.110.3
39-
curios_version=8.0.0-beta.3+1.20.6
39+
cc_tweaked_version=1.111.0
40+
crafttweaker_version=19.0.2
41+
curios_version=8.0.0-beta.5+1.20.6
4042
emi_version=1.1.6
4143
jade_api_id=5288706
4244
jade_id=5366595
4345
top_version=1.20.5_neo-11.1.1-2
44-
wthit_version=11.1.6
46+
wthit_version=11.2.0
4547

4648
#Mod dependency min version ranges
4749

@@ -50,13 +52,12 @@ wthit_version=11.1.6
5052

5153

5254
#Mod dependencies for recipes (only used by our data generators)
53-
ae2_version=18.1.2-alpha
54-
biomesoplenty_version=18.4.0.5
55+
ae2_version=18.1.3-alpha
56+
biomesoplenty_version=18.4.0.7
5557
glitchcore_version=1.1.0.10
56-
terrablender_version=3.5.0.4
58+
terrablender_version=3.5.0.5
5759

5860
#Outdated mod dependencies
59-
crafttweaker_version=17.0.17
6061

6162
ctm_version=1.1.7+11
6263
flux_networks_id=5234697
@@ -65,7 +66,7 @@ jeitweaker_version=8.0.5
6566
json_things_version=0.10.0
6667
oc2_id=3896581
6768
projecte_api_id=4860862
68-
recipe_stages_version=8.0.0.1
69+
recipe_stages_version=8.0.0.2
6970
wildfire_gender_mod_id=5357649
7071

7172
#Outdated mod dependencies for recipes

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
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;
3332
import net.neoforged.neoforge.common.NeoForge;
3433
import net.neoforged.neoforge.event.server.ServerStartingEvent;
3534
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
@@ -54,8 +53,10 @@ public class MekanismAdditions implements IModModule {
5453

5554
public MekanismAdditions(ModContainer modContainer, IEventBus modEventBus) {
5655
Mekanism.addModule(instance = this);
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)));
56+
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
57+
versionNumber = new Version(modContainer);
58+
MekanismAdditionsConfig.registerConfigs(modContainer);
59+
5960
NeoForge.EVENT_BUS.addListener(this::serverStarting);
6061
NeoForge.EVENT_BUS.addListener(this::serverStopping);
6162

@@ -69,9 +70,6 @@ public MekanismAdditions(ModContainer modContainer, IEventBus modEventBus) {
6970
AdditionsSounds.SOUND_EVENTS.register(modEventBus);
7071
AdditionsBiomeModifierSerializers.BIOME_MODIFIER_SERIALIZERS.register(modEventBus);
7172
AdditionsStructureModifierSerializers.STRUCTURE_MODIFIER_SERIALIZERS.register(modEventBus);
72-
73-
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
74-
versionNumber = new Version(modContainer);
7573
}
7674

7775
public static ResourceLocation rl(String path) {

‎src/defense/java/mekanism/defense/common/MekanismDefense.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import net.neoforged.fml.config.ModConfig;
1818
import net.neoforged.fml.event.config.ModConfigEvent;
1919
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
20-
import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
2120
import net.neoforged.neoforge.common.NeoForge;
2221
import net.neoforged.neoforge.event.server.ServerStoppedEvent;
2322

@@ -35,8 +34,9 @@ public class MekanismDefense implements IModModule {
3534

3635
public MekanismDefense(ModContainer modContainer, IEventBus modEventBus) {
3736
Mekanism.addModule(instance = this);
38-
//Ensure that configs don't get added or early initialized in an async way
39-
modEventBus.addListener(FMLConstructModEvent.class, event -> event.enqueueWork(() -> MekanismDefenseConfig.registerConfigs(modContainer)));
37+
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
38+
versionNumber = new Version(modContainer);
39+
MekanismDefenseConfig.registerConfigs(modContainer);
4040
NeoForge.EVENT_BUS.addListener(this::serverStopped);
4141

4242
modEventBus.addListener(this::commonSetup);
@@ -46,9 +46,6 @@ public MekanismDefense(ModContainer modContainer, IEventBus modEventBus) {
4646
DefenseCreativeTabs.CREATIVE_TABS.register(modEventBus);
4747
DefenseContainerTypes.CONTAINER_TYPES.register(modEventBus);
4848
DefenseTileEntityTypes.TILE_ENTITY_TYPES.register(modEventBus);
49-
50-
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
51-
versionNumber = new Version(modContainer);
5249
}
5350

5451
public static ResourceLocation rl(String path) {

‎src/generators/java/mekanism/generators/common/MekanismGenerators.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import mekanism.generators.common.content.turbine.TurbineMultiblockData;
2525
import mekanism.generators.common.content.turbine.TurbineValidator;
2626
import mekanism.generators.common.network.GeneratorsPacketHandler;
27-
import mekanism.generators.common.registries.GeneratorsDataComponents;
2827
import mekanism.generators.common.registries.GeneratorsBlocks;
2928
import mekanism.generators.common.registries.GeneratorsBuilders.FissionReactorBuilder;
3029
import mekanism.generators.common.registries.GeneratorsBuilders.FusionReactorBuilder;
3130
import mekanism.generators.common.registries.GeneratorsBuilders.TurbineBuilder;
3231
import mekanism.generators.common.registries.GeneratorsContainerTypes;
3332
import mekanism.generators.common.registries.GeneratorsCreativeTabs;
33+
import mekanism.generators.common.registries.GeneratorsDataComponents;
3434
import mekanism.generators.common.registries.GeneratorsFluids;
3535
import mekanism.generators.common.registries.GeneratorsGases;
3636
import mekanism.generators.common.registries.GeneratorsItems;
@@ -44,7 +44,6 @@
4444
import net.neoforged.fml.config.ModConfig;
4545
import net.neoforged.fml.event.config.ModConfigEvent;
4646
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
47-
import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
4847
import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
4948

5049
@Mod(MekanismGenerators.MODID)
@@ -74,8 +73,9 @@ public class MekanismGenerators implements IModModule {
7473

7574
public MekanismGenerators(ModContainer modContainer, IEventBus modEventBus) {
7675
Mekanism.addModule(instance = this);
77-
//Ensure that configs don't get added or early initialized in an async way
78-
modEventBus.addListener(FMLConstructModEvent.class, event -> event.enqueueWork(() -> MekanismGeneratorsConfig.registerConfigs(modContainer)));
76+
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
77+
versionNumber = new Version(modContainer);
78+
MekanismGeneratorsConfig.registerConfigs(modContainer);
7979
modEventBus.addListener(this::commonSetup);
8080
modEventBus.addListener(this::onConfigLoad);
8181
modEventBus.addListener(this::imcQueue);
@@ -90,8 +90,6 @@ public MekanismGenerators(ModContainer modContainer, IEventBus modEventBus) {
9090
GeneratorsTileEntityTypes.TILE_ENTITY_TYPES.register(modEventBus);
9191
GeneratorsGases.GASES.register(modEventBus);
9292
GeneratorsModules.MODULES.register(modEventBus);
93-
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
94-
versionNumber = new Version(modContainer);
9593
packetHandler = new GeneratorsPacketHandler(modEventBus, versionNumber);
9694
}
9795

‎src/main/java/mekanism/common/Mekanism.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
import net.neoforged.fml.config.ModConfig;
122122
import net.neoforged.fml.event.config.ModConfigEvent;
123123
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
124-
import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
125124
import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
126125
import net.neoforged.fml.event.lifecycle.InterModProcessEvent;
127126
import net.neoforged.neoforge.common.NeoForge;
@@ -191,8 +190,9 @@ public class Mekanism {
191190

192191
public Mekanism(ModContainer modContainer, IEventBus modEventBus) {
193192
instance = this;
194-
//Ensure that configs don't get added or early initialized in an async way
195-
modEventBus.addListener(FMLConstructModEvent.class, event -> event.enqueueWork(() -> MekanismConfig.registerConfigs(modContainer)));
193+
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
194+
versionNumber = new Version(modContainer);
195+
MekanismConfig.registerConfigs(modContainer);
196196

197197
NeoForgeMod.enableMilkFluid();
198198
NeoForge.EVENT_BUS.addListener(this::onEnergyTransferred);
@@ -248,8 +248,6 @@ public Mekanism(ModContainer modContainer, IEventBus modEventBus) {
248248
MekanismDataMapTypes.REGISTER.register(modEventBus);
249249
modEventBus.addListener(this::registerEventListener);
250250
modEventBus.addListener(this::registerRegistries);
251-
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
252-
versionNumber = new Version(modContainer);
253251
packetHandler = new PacketHandler(modEventBus, versionNumber);
254252
//Super early hooks, only reliable thing is for checking dependencies that we declare we are after
255253
hooks.hookConstructor(modEventBus);

‎src/main/java/mekanism/common/config/IMekanismConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ default boolean isLoaded() {
1414
return getConfigSpec().isLoaded();
1515
}
1616

17-
default boolean loadImmediately() {
18-
return false;
19-
}
20-
2117
ModConfig.Type getConfigType();
2218

2319
default void save() {

‎src/main/java/mekanism/common/config/MekanismConfigHelper.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package mekanism.common.config;
22

3-
import java.lang.reflect.Method;
43
import java.nio.file.Path;
54
import mekanism.common.Mekanism;
65
import net.neoforged.fml.ModContainer;
76
import net.neoforged.fml.config.ConfigTracker;
8-
import net.neoforged.fml.config.ModConfig;
97
import net.neoforged.fml.loading.FMLPaths;
108

119
public class MekanismConfigHelper {
@@ -23,16 +21,5 @@ public static void registerConfig(ModContainer modContainer, IMekanismConfig con
2321
if (config.addToContainer()) {
2422
modContainer.addConfig(modConfig);
2523
}
26-
if (config.loadImmediately()) {
27-
Mekanism.logger.debug("Manually loading config {} early", config.getFileName());
28-
try {
29-
Method method = ConfigTracker.class.getDeclaredMethod("openConfig", ModConfig.class, Path.class, Path.class);
30-
method.setAccessible(true);
31-
method.invoke(ConfigTracker.INSTANCE, modConfig, FMLPaths.CONFIGDIR.get(), null);
32-
method.setAccessible(false);
33-
} catch (Exception e) {
34-
throw new RuntimeException(e);
35-
}
36-
}
3724
}
3825
}

‎src/main/java/mekanism/common/integration/crafttweaker/ingredient/CrTItemStackIngredient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static ItemStackIngredient from(IItemStack stack) {
4242
if (stack.isEmpty()) {
4343
throw new IllegalArgumentException("ItemStackIngredients cannot be created from an empty stack.");
4444
}
45-
return from(stack, stack.getAmount());
45+
return from(stack, stack.amount());
4646
}
4747

4848
/**
@@ -130,7 +130,7 @@ public static ItemStackIngredient from(IIngredient ingredient) {
130130
*/
131131
@ZenCodeType.StaticExpansionMethod
132132
public static ItemStackIngredient from(IIngredientWithAmount ingredient) {
133-
return from(ingredient.getIngredient(), ingredient.getAmount());
133+
return from(ingredient.ingredient(), ingredient.amount());
134134
}
135135

136136
/**

‎src/tools/java/mekanism/tools/common/MekanismTools.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import net.neoforged.fml.config.ModConfig;
1717
import net.neoforged.fml.event.config.ModConfigEvent;
1818
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
19-
import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
2019
import net.neoforged.neoforge.common.NeoForge;
2120

2221
@Mod(MekanismTools.MODID)
@@ -33,8 +32,9 @@ public class MekanismTools implements IModModule {
3332

3433
public MekanismTools(ModContainer modContainer, IEventBus modEventBus) {
3534
Mekanism.addModule(instance = this);
36-
//Ensure that configs don't get added or early initialized in an async way
37-
modEventBus.addListener(FMLConstructModEvent.class, event -> event.enqueueWork(() -> MekanismToolsConfig.registerConfigs(modContainer)));
35+
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
36+
versionNumber = new Version(modContainer);
37+
MekanismToolsConfig.registerConfigs(modContainer);
3838
//Register the listener for special mob spawning (mobs with Mekanism armor/tools)
3939
NeoForge.EVENT_BUS.addListener(MobEquipmentHelper::onLivingSpecialSpawn);
4040

@@ -44,8 +44,6 @@ public MekanismTools(ModContainer modContainer, IEventBus modEventBus) {
4444
ToolsItems.ITEMS.register(modEventBus);
4545
ToolsCreativeTabs.CREATIVE_TABS.register(modEventBus);
4646
ToolsRecipeSerializers.RECIPE_SERIALIZERS.register(modEventBus);
47-
//Set our version number to match the neoforge.mods.toml file, which matches the one in our build.gradle
48-
versionNumber = new Version(modContainer);
4947
}
5048

5149
public static ResourceLocation rl(String path) {

0 commit comments

Comments
 (0)