diff --git a/build.gradle b/build.gradle index 4af40324..72b42beb 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ subprojects { minecraft_version : minecraft_version, forge_version : forge_version, forge_version_range: forge_version_range, forge_loader_version_range: forge_loader_version_range, neoforge_version : neoforge_version, neoforge_version_range: neoforge_version_range, neoforge_loader_version_range: neoforge_loader_version_range, - glitchcore_version : glitchcore_version, + glitchcore_version : glitchcore_version, serene_seasons_version: serene_seasons_version, mod_id : mod_id, mod_name: mod_name, mod_display_name: mod_display_name, mod_version: mod_version, mod_authors : mod_authors, mod_description: mod_description, mod_issues_url : mod_issues_url, mod_page_url: mod_page_url, mod_git_url: mod_git_url, @@ -133,10 +133,10 @@ subprojects { publishing { publications { mavenJava(MavenPublication) { - artifact jar - groupId project.group artifactId project.archivesBaseName + groupId project.group version project.version + from components.java pom { name = project.archivesBaseName diff --git a/common/build.gradle b/common/build.gradle index ed326062..d89e7e2c 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -20,4 +20,5 @@ dependencies { compileOnly("com.electronwill.night-config:core:${nightconfig_version}") compileOnly("net.jodah:typetools:0.6.3") compileOnly 'com.github.glitchfiend:GlitchCore-common:' + minecraft_version + '-' + glitchcore_version + compileOnly 'com.github.glitchfiend:SereneSeasons-common:' + minecraft_version + '-' + serene_seasons_version } diff --git a/common/src/main/java/toughasnails/core/ToughAsNails.java b/common/src/main/java/toughasnails/core/ToughAsNails.java index a1714210..5bf64213 100644 --- a/common/src/main/java/toughasnails/core/ToughAsNails.java +++ b/common/src/main/java/toughasnails/core/ToughAsNails.java @@ -33,6 +33,7 @@ public static void init() addHandlers(); ModPackets.init(); ModApi.init(); + ModCompatibility.init(); } public static void setupClient() diff --git a/forge/src/main/java/toughasnails/forge/init/ModCompatibility.java b/common/src/main/java/toughasnails/init/ModCompatibility.java similarity index 94% rename from forge/src/main/java/toughasnails/forge/init/ModCompatibility.java rename to common/src/main/java/toughasnails/init/ModCompatibility.java index 6eaea8d1..f186ae02 100644 --- a/forge/src/main/java/toughasnails/forge/init/ModCompatibility.java +++ b/common/src/main/java/toughasnails/init/ModCompatibility.java @@ -2,14 +2,14 @@ * Copyright 2021, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.init; +package toughasnails.init; +import glitchcore.util.Environment; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraftforge.fml.ModList; import sereneseasons.api.season.Season; import sereneseasons.api.season.SeasonHelper; import sereneseasons.init.ModTags; @@ -17,13 +17,12 @@ import toughasnails.api.temperature.TemperatureHelper; import toughasnails.api.temperature.TemperatureLevel; import toughasnails.core.ToughAsNails; -import toughasnails.init.ModConfig; public class ModCompatibility { public static void init() { - if (ModList.get().isLoaded("sereneseasons")) + if (Environment.isModLoaded("sereneseasons")) { ToughAsNails.LOGGER.info("Serene Seasons detected. Enabling season modifier."); TemperatureHelper.registerPositionalTemperatureModifier(ModCompatibility::seasonModifier); diff --git a/fabric/build.gradle b/fabric/build.gradle index a72582a0..6e69812a 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -12,6 +12,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" modImplementation "com.github.glitchfiend:GlitchCore-fabric:${minecraft_version}-${glitchcore_version}" + modImplementation "com.github.glitchfiend:SereneSeasons-fabric:${minecraft_version}-${serene_seasons_version}" implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' // Dependencies embedded in final jar diff --git a/forge/build.gradle b/forge/build.gradle index 0d7bcb9e..d62e66f4 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -52,7 +52,7 @@ dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" compileOnly project(":Common") implementation fg.deobf('com.github.glitchfiend:GlitchCore-forge:' + minecraft_version + '-' + glitchcore_version) - implementation fg.deobf("com.github.glitchfiend:SereneSeasons:" + minecraft_version + '-' + serene_seasons_version) + implementation fg.deobf("com.github.glitchfiend:SereneSeasons-forge:${minecraft_version}-${serene_seasons_version}") annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' } diff --git a/forge/src/main/java/toughasnails/forge/core/ToughAsNailsForge.java b/forge/src/main/java/toughasnails/forge/core/ToughAsNailsForge.java index 18a18097..fe5afeaa 100644 --- a/forge/src/main/java/toughasnails/forge/core/ToughAsNailsForge.java +++ b/forge/src/main/java/toughasnails/forge/core/ToughAsNailsForge.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import toughasnails.core.ToughAsNails; -import toughasnails.forge.init.ModCompatibility; +import toughasnails.init.ModCompatibility; @Mod(value = ToughAsNails.MOD_ID) public class ToughAsNailsForge @@ -19,7 +19,6 @@ public class ToughAsNailsForge public ToughAsNailsForge() { IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus(); - bus.addListener(this::loadComplete); bus.addListener(this::clientSetup); ToughAsNails.init(); @@ -30,9 +29,4 @@ private void clientSetup(final FMLClientSetupEvent event) { event.enqueueWork(ToughAsNails::setupClient); } - - private void loadComplete(final FMLLoadCompleteEvent event) - { - event.enqueueWork(ModCompatibility::init); - } } diff --git a/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java b/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java index 8fba531a..5ddf82ff 100644 --- a/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java +++ b/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.ModList; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import toughasnails.forge.init.ModCompatibility; +import toughasnails.init.ModCompatibility; import toughasnails.temperature.TemperatureHelperImpl; @Mixin(value = TemperatureHelperImpl.class, remap = false) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 32cf6fa0..6e02bff2 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -24,4 +24,11 @@ logoFile="${mod_id}_logo.png" mandatory=true versionRange="[${glitchcore_version},)" ordering="AFTER" + side="BOTH" + +[[dependencies.${mod_id}]] + modId="sereneseasons" + mandatory=false + versionRange="[${serene_seasons_version},)" + ordering="AFTER" side="BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 339fbf79..6a62b268 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,5 +40,5 @@ org.gradle.daemon=false # Dependencies nightconfig_version=3.6.7 -glitchcore_version=1.0.0.54 -serene_seasons_version=9.3.0.0 +glitchcore_version=1.0.0.56 +serene_seasons_version=9.3.0.15 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 41e205fa..ff56e3d2 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation "net.neoforged:neoforge:${neoforge_version}" compileOnly project(":Common") implementation 'com.github.glitchfiend:GlitchCore-neoforge:' + minecraft_version + '-' + glitchcore_version + implementation "com.github.glitchfiend:SereneSeasons-neoforge:${minecraft_version}-${serene_seasons_version}" } // NeoGradle compiles the game, but we don't want to add our common code to the game's code diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index fd72875c..3fb9656c 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -24,4 +24,11 @@ logoFile="${mod_id}_logo.png" required=true versionRange="[${glitchcore_version},)" ordering="AFTER" + side="BOTH" + +[[dependencies.${mod_id}]] + modId="sereneseasons" + required=false + versionRange="[${serene_seasons_version},)" + ordering="AFTER" side="BOTH" \ No newline at end of file