diff --git a/.gitignore b/.gitignore index a154f79d1..b39c64a0d 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ logs/ forge*changelog.txt shapegen_output.java +/runs/data/config/fml.toml diff --git a/build.gradle.kts b/build.gradle.kts index 527bfb6f9..e4d5635f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -334,12 +334,11 @@ tasks.jarJar.configure { tasks.withType(ProcessResources::class.java) { val replaceProperties = mapOf( "mc_version" to mc_version, - "mod_id" to mod_id, "mod_version" to gitVersion.modVersion ) inputs.properties(replaceProperties) - filesMatching(arrayListOf("META-INF/mods.toml", "pack.mcmeta")) { + filesMatching(arrayListOf("META-INF/neoforge.mods.toml", "pack.mcmeta")) { expand(replaceProperties) } } diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index d5a102d14..88d242677 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -6,7 +6,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[21,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[4,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license="2 Clause BSD" @@ -15,7 +15,7 @@ license="2 Clause BSD" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="${mod_id}" #mandatory +modId="overdrive_that_matters" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it version="${mod_version}" #mandatory # A display name for the mod @@ -35,19 +35,19 @@ description=''' Matter. Energy. Combined. ''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.${mod_id}]] #optional +[[dependencies.overdrive_that_matters]] #optional # the modid of the dependency - modId="forge" #mandatory + modId="neoforge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[51.0.0,)" #mandatory + versionRange="[21.1.1,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER side="BOTH" # Here's another dependency -[[dependencies.${mod_id}]] +[[dependencies.overdrive_that_matters]] modId="minecraft" mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 07bda9007..91f03eb22 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "${mod_id} resources", + "description": "OTM resources", "pack_format": 18 } }