diff --git a/build.gradle b/build.gradle index a59c7cef..32cdf6c5 100644 --- a/build.gradle +++ b/build.gradle @@ -9,12 +9,11 @@ buildscript { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } - maven { - url = "https://jitpack.io" - } } dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4' + classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') { + changing = true + } } } @@ -30,6 +29,9 @@ repositories { maven { name = "gt" url = "https://gregtech.overminddl1.com/" + metadataSources { + artifact() + } } maven { name = "jitpack" @@ -40,7 +42,7 @@ repositories { }*/ } dependencies { - implementation "com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev" + implementation "com.github.GTNewHorizons:NotEnoughItems:2.3.19-GTNH:dev" implementation "com.github.GTNewHorizons:EnderStorage:master-SNAPSHOT:dev" implementation "com.github.GTNewHorizons:waila:master-SNAPSHOT:dev" @@ -96,31 +98,12 @@ processResources { // exclude xcf files, as they are for development only exclude '**/*.xcf' - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include '*.info' + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version - // replace version and mcversion - expand 'mod_version': project.version, 'minecraft_version': project.config.minecraft_version + filesMatching('mcmod.info') { + expand 'version':project.version, 'mcversion':project.minecraft.version } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude '**/*.info' - } -} - -task devJar(type: Jar, dependsOn: 'classes') { - from(sourceSets.main.output) { - include '**' - } - - extension = 'jar' - classifier = 'dev' -} - -artifacts { - archives devJar } uploadArchives { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index b16be582..0309e400 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,8 +3,8 @@ "modid": "EE3", "name": "Equivalent Exchange 3", "description": "Transmute stuff into other stuff! Become a Minecraft God!", - "version": "${mod_version}", - "mcversion": "${minecraft_version}", + "version": "${version}", + "mcversion": "${mcversion}", "url": "http://www.minecraftforum.net/topic/1106178-", "updateUrl": "", "authorList": [ @@ -19,4 +19,4 @@ "dependencies": [ ] } -] \ No newline at end of file +]