diff options
| author | miozune <miozune@gmail.com> | 2023-01-17 19:50:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 11:50:11 +0100 |
| commit | db29de6794a229dff55b5361a7866fbf921ab28d (patch) | |
| tree | 6414a1649e431d6986413f1cbe00c0b8e6e8872e | |
| parent | cfa09c7ed0d172494461c22fdd2831d037c709a1 (diff) | |
| download | GT5-Unofficial-db29de6794a229dff55b5361a7866fbf921ab28d.tar.gz GT5-Unofficial-db29de6794a229dff55b5361a7866fbf921ab28d.tar.bz2 GT5-Unofficial-db29de6794a229dff55b5361a7866fbf921ab28d.zip | |
Fix loading order (#267)
* Update buildscript & dependencies
* Set useDependencyInformation to false
Former-commit-id: 93f055437b49cad56c15c1af6266a4f6c9d198d0
| -rw-r--r-- | build.gradle | 17 | ||||
| -rw-r--r-- | dependencies.gradle | 5 | ||||
| -rw-r--r-- | src/main/resources/mcmod.info | 6 |
3 files changed, 15 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle index fa88ae1be7..2dc32c9f20 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1671313514 +//version: 1673027205 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -46,7 +46,7 @@ buildscript { } dependencies { //Overwrite the current ASM version to fix shading newer than java 8 applicatations. - classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3' + classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3' classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13' } } @@ -319,9 +319,13 @@ if (file('addon.gradle').exists()) { apply from: 'repositories.gradle' configurations { - implementation.extendsFrom(shadowImplementation) // TODO: remove after all uses are refactored - implementation.extendsFrom(shadowCompile) - implementation.extendsFrom(shadeCompile) + // TODO: remove Compile after all uses are refactored to Implementation + for (config in [shadowImplementation, shadowCompile, shadeCompile]) { + compileClasspath.extendsFrom(config) + runtimeClasspath.extendsFrom(config) + testCompileClasspath.extendsFrom(config) + testRuntimeClasspath.extendsFrom(config) + } } repositories { @@ -350,7 +354,8 @@ dependencies { annotationProcessor('com.google.code.gson:gson:2.8.6') annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.3:processor') if (usesMixinDebug.toBoolean()) { - runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16') + runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16') + testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16') } } if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { diff --git a/dependencies.gradle b/dependencies.gradle index 37ef834fde..9111782b83 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,10 +8,7 @@ dependencies { compile("com.github.GTNewHorizons:TinkersConstruct:1.9.11-GTNH:dev") compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.6:dev") compile("com.github.GTNewHorizons:CodeChickenCore:1.1.7:dev") - compile("com.github.GTNewHorizons:Galacticraft:3.0.62-GTNH:dev") { - exclude group:"com.github.GTNewHorizons", module:"SpongePoweredMixin" - exclude group:"com.github.GTNewHorizons", module:"SpongeMixins" - } + compile("com.github.GTNewHorizons:Galacticraft:3.0.63-GTNH:dev") compile("com.github.GTNewHorizons:ModularUI:1.0.38:dev") compile("com.github.GTNewHorizons:GalacticGregGT5:1.0.8:dev") { exclude group:"com.github.GTNewHorizons", module:"bartworks" diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index d2b71dd111..a7205e0523 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -16,7 +16,7 @@ "requiredMods": [], "dependencies": [], "dependants": [], - "useDependencyInformation": true + "useDependencyInformation": false },{ "modid": "bartworkscrossmod", "name": "BartWorks Mod Additions", @@ -33,7 +33,7 @@ "requiredMods": [], "dependencies": [], "dependants": [], - "useDependencyInformation": true + "useDependencyInformation": false },{ "modid": "bartworkscrossmodtgregworkscontainer", "name": "BartWorks Mod Additions - TGregworks Container", @@ -50,6 +50,6 @@ "requiredMods": [], "dependencies": [], "dependants": [], - "useDependencyInformation": true + "useDependencyInformation": false }] } |