diff --git a/.lgtm.yml b/.lgtm.yml index e1ac7e672cf..4a718785bc2 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -6,4 +6,4 @@ extraction: index: java_version: 8 gradle: - version: 7.1 \ No newline at end of file + version: 7.2 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3609f592ad8..52121e0e96a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,9 +12,14 @@ buildscript { name "forge" url "https://maven.minecraftforge.net/" } + maven { + name 'parchment' + url 'https://maven.parchmentmc.org' + } } dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath 'org.parchmentmc:librarian:1.+' } } @@ -28,10 +33,11 @@ plugins { } apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'org.parchmentmc.librarian.forgegradle' wrapper { //Define wrapper values here so as to not have to always do so when updating gradlew.properties - gradleVersion = '7.1.1' + gradleVersion = '7.2' distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.properties b/gradle.properties index 3982507875c..81f1f7d07b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.16.5 -mappings_version=2021-03-13-1.16.5 -mappings_channel=mojmapwithdoc +mappings_version=2021.08.29-1.16.5 +mappings_channel=parchment loader_version_range=[36,) forge_version=36.2.2 mod_version=10.0.21 @@ -19,34 +19,34 @@ curse_release_type=release # Only bump them whenever we need access to a feature that is not available in earlier versions # Currently No min versions for optional dependencies -jb_annotations=21.0.1 +jb_annotations=22.0.0 #JUnit/Testing dependencies -junit_version=5.7.2 +junit_version=5.8.1 quicktheories_version=0.26 #Mod dependencies -computer_craft_version=1.98.1 -crafttweaker_version=7.1.0.367 +computer_craft_version=1.98.2 +crafttweaker_version=7.1.2.445 ctm_version=1.1.1.5 -curios_version=1.16.5-4.0.5.2 +curios_version=1.16.5-4.0.5.3 flux_networks_id=3285556 -jade_api_id=3389762 -jade_id=3389760 -jei_version=7.7.1.117 -jeitweaker_version=1.0.1.34 +jade_api_id=3467446 +jade_id=3467445 +jei_version=7.7.1.121 +jeitweaker_version=1.0.1.35 projecte_api_id=3223223 top_version=1.16-3.1.4-22 #Mod dependency min version ranges jei_version_range=[7.7.1.117,) -crafttweaker_version_range=[7.1.0.329,) +crafttweaker_version_range=[7.1.2.445,) #Mod dependencies for recipes (only used by our data generators) -ae2_version=8.4.0 +ae2_version=8.4.1 biomesoplenty_api_id=3407192 biomesoplenty_id=3407189 -byg_id=3409287 +byg_id=3444476 ilikewood_id=3285752 ilikewood_bop_id=3285758 ilikewood_byg_id=3286762 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af7be50b101..a0f7639f7d3 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/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists