|
3 | 3 | * DO NOT CHANGE THIS FILE! |
4 | 4 | * Also, you may replace this file at any time if there is an update available. |
5 | 5 | * Please check https://github.com/GregTechCEu/Buildscripts/blob/master/build.gradle for updates. |
| 6 | + * You can also run ./gradlew updateBuildScript to update your buildscript. |
6 | 7 | */ |
7 | 8 |
|
8 | 9 | import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar |
@@ -53,6 +54,7 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly") |
53 | 54 |
|
54 | 55 | // Optional properties: we can assume some default behavior if these are missing |
55 | 56 | propertyDefaultIfUnset("modVersion", "") |
| 57 | +propertyDefaultIfUnset("includeMCVersionJar", false) |
56 | 58 | propertyDefaultIfUnset("autoUpdateBuildScript", false) |
57 | 59 | propertyDefaultIfUnset("modArchivesBaseName", project.modId) |
58 | 60 | propertyDefaultIfUnsetWithEnvVar("developmentEnvironmentUserName", "Developer", "DEV_USERNAME") |
@@ -263,7 +265,13 @@ if (!modVersion) { |
263 | 265 | } |
264 | 266 | } |
265 | 267 |
|
266 | | -version = modVersion |
| 268 | +if (includeMCVersionJar.toBoolean()){ |
| 269 | + version = "${minecraftVersion}-${modVersion}" |
| 270 | +} |
| 271 | +else { |
| 272 | + version = modVersion |
| 273 | +} |
| 274 | + |
267 | 275 | group = modGroup |
268 | 276 | archivesBaseName = modArchivesBaseName |
269 | 277 |
|
@@ -672,22 +680,32 @@ idea { |
672 | 680 | project { |
673 | 681 | settings { |
674 | 682 | runConfigurations { |
675 | | - '1. Run Client'(Gradle) { |
| 683 | + '1. Setup Workspace'(Gradle) { |
| 684 | + taskNames = ['setupDecompWorkspace'] |
| 685 | + } |
| 686 | + '2. Run Client'(Gradle) { |
676 | 687 | taskNames = ['runClient'] |
677 | 688 | } |
678 | | - '2. Run Server'(Gradle) { |
| 689 | + '3. Run Server'(Gradle) { |
679 | 690 | taskNames = ['runServer'] |
680 | 691 | } |
681 | | - '3. Run Obfuscated Client'(Gradle) { |
| 692 | + '4. Run Obfuscated Client'(Gradle) { |
682 | 693 | taskNames = ['runObfClient'] |
683 | 694 | } |
684 | | - '4. Run Obfuscated Server'(Gradle) { |
| 695 | + '5. Run Obfuscated Server'(Gradle) { |
685 | 696 | taskNames = ['runObfServer'] |
686 | 697 | } |
687 | 698 | if (enableSpotless.toBoolean()) { |
688 | | - "5. Apply Spotless"(Gradle) { |
| 699 | + '6. Apply Spotless'(Gradle) { |
689 | 700 | taskNames = ["spotlessApply"] |
690 | 701 | } |
| 702 | + '7. Build Jars'(Gradle) { |
| 703 | + taskNames = ['build'] |
| 704 | + } |
| 705 | + } else { |
| 706 | + '6. Build Jars'(Gradle) { |
| 707 | + taskNames = ['build'] |
| 708 | + } |
691 | 709 | } |
692 | 710 | 'Update Buildscript'(Gradle) { |
693 | 711 | taskNames = ['updateBuildScript'] |
|
0 commit comments