Skip to content

Commit

Permalink
Comment on current config option
Browse files Browse the repository at this point in the history
  • Loading branch information
62832 committed Apr 20, 2024
1 parent 3b92550 commit 42b58fc
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 13 deletions.
19 changes: 10 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ sourceSets {
main {
resources.srcDir(file("src/generated/resources"))
}

create("data") {
val main = main.get()
compileClasspath += main.compileClasspath + main.output
Expand All @@ -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"))
}
}
Expand All @@ -90,16 +91,16 @@ tasks {
withType<JavaCompile> {
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)
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/gripe/_90/megacells/definition/MEGAConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<MaterialItem> MEGA_CHEMICAL_CELL_HOUSING =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 42b58fc

Please sign in to comment.