diff --git a/Forge/build.gradle b/Forge/build.gradle index 5af4923..b54c537 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -20,14 +20,20 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(16) minecraft { mappings channel: 'official', version: minecraft_version - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. + + if (project.hasProperty('forge_ats_enabled') && project.findProperty('forge_ats_enabled').toBoolean()) { + // This location is hardcoded in Forge and can not be changed. + // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123 + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + project.logger.debug('Forge Access Transformers are enabled for this project.') + } runs { client { workingDirectory project.file('run') ideaModule "${rootProject.name}.${project.name}.main" mods { - examplemod { + modClientRun { source sourceSets.main source project(":Common").sourceSets.main } @@ -38,7 +44,7 @@ minecraft { workingDirectory project.file('run') ideaModule "${rootProject.name}.${project.name}.main" mods { - examplemod { + modServerRun { source sourceSets.main source project(":Common").sourceSets.main } @@ -50,7 +56,7 @@ minecraft { ideaModule "${rootProject.name}.${project.name}.main" args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') mods { - examplemod { + modDataRun { source sourceSets.main source project(":Common").sourceSets.main } diff --git a/gradle.properties b/gradle.properties index 2c4b67e..709b189 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,11 +2,12 @@ minecraft_version=1.17.1 # Forge -forge_version=37.0.13 +forge_version=37.0.70 +//forge_ats_enabled=true # Fabric -fabric_version=0.37.0+1.17 -fabric_loader_version=0.11.6 +fabric_version=0.40.1+1.17 +fabric_loader_version=0.11.7 # Mod options mod_group=com.blamejared.multiloader diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0595cf7..ffed3a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.2-20210702220150+0000-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists