diff --git a/build.gradle.kts b/build.gradle.kts index fe2038d6..6ca6fccd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,7 +50,7 @@ sourceSets { main { resources.srcDir(file("src/generated/resources")) } - + create("data") { val main = main.get() compileClasspath += main.compileClasspath + main.output @@ -62,20 +62,21 @@ runs { configureEach { workingDirectory(file("run")) systemProperty("forge.logging.console.level", "info") - + modSource(sourceSets.main.get()) } - + create("client") create("server") - + create("data") { programArguments.addAll( "--mod", modId, "--all", "--output", file("src/generated/resources/").absolutePath, - "--existing", file("src/main/resources/").absolutePath) - + "--existing", file("src/main/resources/").absolutePath + ) + modSource(sourceSets.getByName("data")) } } @@ -90,16 +91,16 @@ tasks { withType { options.encoding = "UTF-8" } - + processResources { exclude("**/.cache") - + val props = mapOf( "version" to version, "ae2Version" to libs.versions.ae2.get(), "ae2VersionEnd" to libs.versions.ae2.get().substringBefore('.').toInt() + 1, ) - + inputs.properties(props) filesMatching("META-INF/mods.toml") { expand(props) diff --git a/src/main/java/gripe/_90/megacells/definition/MEGAConfig.java b/src/main/java/gripe/_90/megacells/definition/MEGAConfig.java index 1b57449b..e6fc2550 100644 --- a/src/main/java/gripe/_90/megacells/definition/MEGAConfig.java +++ b/src/main/java/gripe/_90/megacells/definition/MEGAConfig.java @@ -9,7 +9,10 @@ public class MEGAConfig { private final ModConfigSpec.BooleanValue spentNuclearWasteAllowed; public MEGAConfig(ModConfigSpec.Builder builder) { - spentNuclearWasteAllowed = builder.define("spentNuclearWasteAllowed", false); + spentNuclearWasteAllowed = builder.comment( + "Whether to allow the Radioactive Chemical Cell to store Spent Nuclear Waste.", + "AppMek integration feature.") + .define("spentNuclearWasteAllowed", false); } public boolean isSpentWasteAllowed() { diff --git a/src/main/java/gripe/_90/megacells/integration/appmek/AppMekItems.java b/src/main/java/gripe/_90/megacells/integration/appmek/AppMekItems.java index 0960a785..96bbca09 100644 --- a/src/main/java/gripe/_90/megacells/integration/appmek/AppMekItems.java +++ b/src/main/java/gripe/_90/megacells/integration/appmek/AppMekItems.java @@ -20,8 +20,9 @@ import gripe._90.megacells.integration.appmek.item.RadioactiveCellItem; public final class AppMekItems { + @SuppressWarnings("EmptyMethod") public static void init() { - // noop + // TODO: Replace with deferred registration when AE2 does so } public static final ItemDefinition MEGA_CHEMICAL_CELL_HOUSING = diff --git a/src/main/java/gripe/_90/megacells/mixin/ItemEntityMixin.java b/src/main/java/gripe/_90/megacells/mixin/ItemEntityMixin.java index 37a33f2f..ef4cb8aa 100644 --- a/src/main/java/gripe/_90/megacells/mixin/ItemEntityMixin.java +++ b/src/main/java/gripe/_90/megacells/mixin/ItemEntityMixin.java @@ -19,6 +19,7 @@ @Mixin(value = ItemEntity.class, priority = 500) public abstract class ItemEntityMixin extends Entity { + @SuppressWarnings("unused") public ItemEntityMixin(EntityType type, Level level) { super(type, level); } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 9b4638be..965dbca6 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -18,9 +18,9 @@ displayURL = "https://github.com/62832/MEGACells" [[mixins]] config = "megacells.mixins.json" -[[dependencies.megacells]] +[[dependencies]] modId = "ae2" type = "required" versionRange = "[$ae2Version,$ae2VersionEnd)" ordering = "AFTER" - side= "BOTH" + side = "BOTH"