Misc gradle cleanup

Glitchfiend · Nov 20, 2023 · c47d502 · c47d502
1 parent 50c6261
commit c47d502
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 25 deletions.
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -59,10 +59,7 @@ jar {
 }
 
 curseforge {
-    if (project.hasProperty('curseApiKey')) {
-        apiKey = project.getProperty('curseApiKey')
-    }
-
+    apiKey = project.findProperty('curseApiKey')
     project {
         id = '565956'
 
@@ -89,9 +86,7 @@ curseforge {
 }
 
 modrinth {
-    if (project.hasProperty('modrinthToken')) {
-        token = project.getProperty('modrinthToken')
-    }
+    token = project.findProperty('modrinthToken')
     projectId = "terrablender"
     versionNumber = mod_version
     versionName = mod_version + " for Fabric " + minecraft_version
@@ -107,7 +102,6 @@ modrinth {
     dependencies {
         required.project "fabric-api"
     }
-    // debugMode = true
 }
 
 publishing {

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -5,12 +5,10 @@ plugins {
     id "com.modrinth.minotaur" version "2.+"
 }
 
-
 base.archivesName.set("${mod_name}-forge")
 
 minecraft {
     mappings channel: 'official', version: minecraft_version
-
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
     runs {
@@ -90,9 +88,7 @@ processResources {
 jar.finalizedBy('reobfJar')
 
 curseforge {
-    if (project.hasProperty('curseApiKey')) {
-        apiKey = project.getProperty('curseApiKey')
-    }
+    apiKey = project.findProperty('curseApiKey')
     project {
         id = '563928'
 
@@ -110,9 +106,7 @@ curseforge {
 }
 
 modrinth {
-    if (project.hasProperty('modrinthToken')) {
-        token = project.getProperty('modrinthToken')
-    }
+    token = project.findProperty('modrinthToken')
     projectId = "terrablender"
     versionNumber = mod_version
     versionName = mod_version + " for Forge " + minecraft_version
@@ -124,7 +118,6 @@ modrinth {
     if (changelog_file.exists()) {
         changelog = '```\n' + changelog_file.text + '\n```'
     }
-    // debugMode = true
 }
 
 publishing {

diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
@@ -22,12 +22,12 @@ runs {
 
     client {
         workingDirectory.set(project.file('run'))
-        systemProperty 'neoforge.enabledGameTestNamespaces', 'terrablender'
+        systemProperty 'neoforge.enabledGameTestNamespaces', mod_id
     }
 
     server {
         workingDirectory.set(project.file('run'))
-        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        systemProperty 'neoforge.enabledGameTestNamespaces', mod_id
         programArgument '--nogui'
     }
 }
@@ -67,9 +67,7 @@ tasks.withType(ProcessResources).excludingNeoTasks().configureEach {
 }
 
 curseforge {
-    if (project.hasProperty('curseApiKey')) {
-        apiKey = project.getProperty('curseApiKey')
-    }
+    apiKey = project.findProperty('curseApiKey')
     project {
         id = '940057'
 
@@ -79,6 +77,7 @@ curseforge {
 
         releaseType = release_channel
         addGameVersion minecraft_version
+        addGameVersion 'NeoForge' // NeoForge isn't auto-detected and must be manually specified
 
         mainArtifact(jar) {
             displayName = "TerraBlender NeoForge ${version}"
@@ -87,9 +86,7 @@ curseforge {
 }
 
 modrinth {
-    if (project.hasProperty('modrinthToken')) {
-        token = project.getProperty('modrinthToken')
-    }
+    token = project.findProperty('modrinthToken')
     projectId = "terrablender"
     versionNumber = mod_version
     versionName = mod_version + " for NeoForge " + minecraft_version