diff --git a/build.gradle b/build.gradle index 49751133..e9e1059c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ buildscript { } } + import com.diluv.schoomp.Webhook import com.diluv.schoomp.message.Message @@ -26,9 +27,10 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'org.parchmentmc.librarian.forgegradle' apply plugin: 'org.spongepowered.mixin' -version = '0.8.0' -group = 'at.petra-k.hexcasting' // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = 'hexcasting-1.18.2' + +version = modVersion +group = "at.petra-k.$modID" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "$modID-$minecraftVersion" def isRelease = { -> try { @@ -66,41 +68,12 @@ if (!isRelease() && System.getenv('BUILD_NUMBER') != null) { // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. java.toolchain.languageVersion = JavaLanguageVersion.of(17) -// Adds the Kotlin Gradle plugin -buildscript { - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" - // OPTIONAL Kotlin Serialization plugin - classpath 'org.jetbrains.kotlin:kotlin-serialization:1.6.10' - } -} -apply plugin: 'kotlin' -// OPTIONAL Kotlin Serialization plugin -apply plugin: 'kotlinx-serialization' - -// Adds KFF as dependency and Kotlin libs to the runtime classpath -// If you already know how to add the Kotlin plugin to Gradle, this is the only line you need for KFF -apply from: 'https://raw.githubusercontent.com/thedarkcolour/KotlinForForge/site/thedarkcolour/kotlinforforge/gradle/kff-3.0.0.gradle' - -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" minecraft { - // The mappings can be changed at any time and must be in the following format. - // Channel: Version: - // snapshot YYYYMMDD Snapshot are built nightly. - // stable # Stables are built at the discretion of the MCP team. - // official MCVersion Official field/method names from Mojang mapping files - // - // You must be aware of the Mojang license when using the 'official' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Use non-default mappings at your own risk. They may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'parchment', version: '2022.03.13-1.18.2' + // After running this the first time, switch which is commented and rerun genIntellijRuns + mappings channel: 'official', version: '1.18.2' + // mappings channel: 'parchment', version: '2022.03.13-1.18.2' - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. runs { client { workingDirectory project.file('run') @@ -117,12 +90,11 @@ minecraft { // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' - // unbreak patchi?? - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', modID mods { - hexcasting { + create(modID) { source sourceSets.main } } @@ -131,29 +103,24 @@ minecraft { server { workingDirectory project.file('run') - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. property 'forge.logging.markers', 'REGISTRIES' - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', modID mods { - hexcasting { + create(modID) { source sourceSets.main } } } - data { + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { workingDirectory project.file('run') // Recommended logging data for a userdev environment @@ -168,14 +135,28 @@ minecraft { // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', 'hexcasting', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', modID mods { - hexcasting { + create(modID) { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', modID, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + + mods { + create(modID) { source sourceSets.main } } @@ -186,71 +167,39 @@ minecraft { // Include resources generated by data generators. sourceSets.main.resources { srcDir 'src/generated/resources' } -repositories { - mavenCentral() - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: - // flatDir { - // dir 'libs' - // } - maven { url 'https://maven.blamejared.com' } - - maven { - // location of the maven that hosts JEI files - name = "Progwml6 maven" - url = "https://dvs1.progwml6.com/files/maven/" - } - maven { - // location of a maven mirror for JEI files, as a fallback - name = "ModMaven" - url = "https://modmaven.dev" - } -} - -dependencies { - implementation 'org.testng:testng:7.1.0' - - // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed - // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. - // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.18.2-40.0.19' - annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' - - compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-66:api") - runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-66") - - // compile against the JEI API but do not include it at runtime - compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143:api") - // at runtime, use the full JEI jar - runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143") - - compileOnly fg.deobf("at.petra-k.paucal:paucal-1.18.2:0.3.2") - runtimeOnly fg.deobf("at.petra-k.paucal:paucal-1.18.2:0.3.2") -} - mixin { - add sourceSets.main, 'hexcasting.mixins.refmap.json' - config 'hexcasting.mixins.json' + add sourceSets.main, "${modID}.mixins.refmap.json" + config "${modID}.mixins.json" dumpTargetOnFailure true } -java { - withJavadocJar() - withSourcesJar() + +repositories { + maven { url 'https://maven.blamejared.com' } +} + +dependencies { + // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed + // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. + // The userdev artifact is a special name and will get all sorts of transformations applied to it. + minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}" + + annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' + + compileOnly fg.deobf("at.petra-k.paucal:paucal-$minecraftVersion:$paucalVersion") + runtimeOnly fg.deobf("at.petra-k.paucal:paucal-$minecraftVersion:$paucalVersion") } // Example for how to get properties into the manifest for reading at runtime. jar { manifest { attributes([ - "Specification-Title" : "hexcasting", - "Specification-Vendor" : "petrak-at", + "Specification-Title" : modID, + "Specification-Vendor" : "petra-kat", "Specification-Version" : "1", // We are version 1 of ourselves "Implementation-Title" : project.name, "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : "petrak-at", + "Implementation-Vendor" : "petra-kat", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } @@ -262,12 +211,10 @@ jar.finalizedBy('reobfJar') // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing // publish.dependsOn('reobfJar') - // Disables Gradle's custom module metadata from being published to maven. The // metadata includes mapped dependencies which are not reasonably consumable by // other mod developers. tasks.withType(GenerateModuleMetadata) { - enabled = false } @@ -280,9 +227,7 @@ publishing { from components.java pom.withXml { - asNode().dependencies.dependency.each { dep -> - assert dep.parent().remove(dep) } } @@ -294,14 +239,6 @@ publishing { } } } -compileKotlin { - kotlinOptions { - } -} -compileTestKotlin { - kotlinOptions { - } -} def getGitChangelog = { -> try { @@ -311,13 +248,13 @@ def getGitChangelog = { -> def travisRange = System.getenv('TRAVIS_COMMIT_RANGE') if (gitHash && gitPrevHash) { exec { - commandLine 'git', 'log', '--pretty=tformat:> %s', '' + gitPrevHash + '...' + gitHash + commandLine 'git', 'log', '--pretty=tformat:> - %s', '' + gitPrevHash + '...' + gitHash standardOutput = stdout } return stdout.toString().trim() } else if (travisRange) { exec { - commandLine 'git', 'log', '--pretty=tformat:> %s', '' + travisRange + commandLine 'git', 'log', '--pretty=tformat:> - %s', '' + travisRange standardOutput = stdout } return stdout.toString().trim() @@ -340,7 +277,7 @@ task sendWebhook { def message = new Message() message.setUsername("Patreon Early Access") - message.setContent("New Hexcasting release! Download it here: ${System.getenv("BUILD_URL")}\nChangelog:\n${getGitChangelog()}") + message.setContent("New **$modName** release! Download it here: ${System.getenv("BUILD_URL")}\nChangelog:\n${getGitChangelog()}") webhook.sendMessage(message) } catch (ignored) { @@ -349,3 +286,6 @@ task sendWebhook { } } +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 784899a6..2d482807 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,3 +2,9 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false +modID=hexcasting +modName=Hex Casting +minecraftVersion=1.18.2 +modVersion=0.8.0 +forgeVersion=40.1.0 +paucalVersion=0.3.4 diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index df347fb9..18d5383e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -7,7 +7,7 @@ issueTrackerURL = "https://github.com/gamma-delta/HexMod/issues" [[mods]] modId = "hexcasting" version = "${file.jarVersion}" -displayName = "Hexcasting" +displayName = "Hex Casting" displayURL = "https://github.com/gamma-delta/HexMod" logoFile = "logo.png" credits = "Falkory for textures; Wiresegal for lots of polish; Alwinfy for visual effects, proofreading, and code help; Kra3tor for sound effects; naj77 for the nice logo; and all of my wonderful patrons for supporting me!"