From c6939e20b61f8bafb467178d7c0d420feabb304e Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Mon, 13 Mar 2023 19:34:56 +0100 Subject: [PATCH] chore: it compiles! --- build.gradle | 23 +++++++---------------- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 0 3 files changed, 8 insertions(+), 17 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index 028a40e..2fd5f41 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() maven { name = "forge" - url = "http://files.minecraftforge.net/maven" + url = "https://maven.minecraftforge.net/" } maven { name = "sonatype" @@ -11,7 +11,9 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath ('com.anatawa12.forge:ForgeGradle:1.2-1.0.+') { + changing = true + } } } @@ -27,7 +29,7 @@ compileJava { } minecraft { - version = "1.7.10-10.13.4.1558-1.7.10" + version = "1.7.10-10.13.4.1614-1.7.10" runDir = "eclipse" } @@ -47,22 +49,11 @@ dependencies { } -processResources -{ - // this will ensure that this task is redone when the versions change. +processResources { inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion + 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 'mcmod.info' - } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb6e79c..ddcd48b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755