diff --git a/build.gradle b/build.gradle index b70f32759..c7435139c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'eclipse' + id 'idea' id 'net.minecraftforge.gradle' version '[6.0,6.2)' id 'org.spongepowered.mixin' version '0.7.+' id 'org.parchmentmc.librarian.forgegradle' version '1.+' @@ -16,9 +17,14 @@ def getGitCommitHash() { version = "${mod_version}-SNAPSHOT-${getGitCommitHash()}" group = 'com.atsushio.superbwarfare' -archivesBaseName = 'superbwarfare' -java.toolchain.languageVersion = JavaLanguageVersion.of(17) +base { + archivesName = mod_id +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(17) +} minecraft { mappings channel: 'parchment', version: '2023.08.13-1.20.1' @@ -26,18 +32,32 @@ minecraft { accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') copyIdeResources = true + runs { configureEach { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + property 'forge.logging.console.level', 'info' + property 'geckolib.disable_examples', 'true' + + mods { + "${mod_id}" { + source sourceSets.main + } + } } client { + property 'forge.enabledGameTestNamespaces', mod_id property 'mixin.env.remapRefMap', 'true' property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" property 'geckolib.disable_examples', 'true' } server { + property 'forge.enabledGameTestNamespaces', mod_id property 'mixin.env.remapRefMap', 'true' property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" } @@ -79,10 +99,10 @@ dependencies { implementation fg.deobf('software.bernie.geckolib:geckolib-forge-1.20.1:4.4.6') // compile against the JEI API but do not include it at runtime - compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")) - compileOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")) + compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")) + compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")) // at runtime, use the full JEI jar for Forge - runtimeOnly(fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")) + runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")) implementation fg.deobf("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}") } @@ -99,6 +119,39 @@ mixin { quiet } +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version : forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors : mod_authors, mod_description: mod_description, + ] + + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } +} + +tasks.named('jar', Jar).configure { + manifest { + attributes([ + "Specification-Title" : mod_id, + "Specification-Vendor" : mod_authors, + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : project.jar.archiveVersion, + "Implementation-Vendor" : mod_authors, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } + + // This is the preferred method to reobfuscate your jar file + finalizedBy 'reobfJar' +} + tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation } diff --git a/gradle.properties b/gradle.properties index 609145962..a0fe69243 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,17 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mc_version=1.20.1 +minecraft_version_range=[1.20.1,1.21) +forge_version=47.2.0 +forge_version_range=[47,) +loader_version_range=[47,) + +mod_id=superbwarfare +mod_name=Superb Warfare +mod_license=GNU General Public License v3.0 +mod_description=A Warfare Mod +minecraft_version=1.20.1 jei_version=15.2.0.27 cloth_config_version=11.1.106 -mod_version=0.2.8 \ No newline at end of file +mod_version=0.2.8 +mod_authors=Atsuishio, Roki27, Light_Quanta \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 50ab1c8da..0017df942 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,28 +1,35 @@ modLoader = "javafml" -loaderVersion = "[47,)" -license = "Academic Free License v3.0" +loaderVersion = "${loader_version_range}" +license = "${mod_license}" [[mods]] modId = "superbwarfare" -version = "1.0.0" +version = "${mod_version}" displayName = "Superb Warfare" -displayURL = "https://mcreator.net" -credits = "Created using mod maker MCreator - https://mcreator.net/about" -authors = "Atsuishio, MCreator" +authors = "${mod_authors}" +description = "${mod_description}" + +[[dependencies.superbwarfare]] +modId = "forge" #mandatory +mandatory = true #mandatory +versionRange = "${forge_version_range}" #mandatory +ordering = "NONE" +side = "BOTH"# Here's another dependency [[dependencies.superbwarfare]] modId = "minecraft" mandatory = true -versionRange = "[1.20.1]" +versionRange = "${minecraft_version_range}" ordering = "NONE" side = "BOTH" [[dependencies.superbwarfare]] -modId = "curios_api" +modId = "curios" mandatory = false -versionRange = "[0,)" +versionRange = "[5.4.0,)" ordering = "NONE" side = "BOTH" + [[dependencies.superbwarfare]] modId = "geckolib" mandatory = false