From 9136fea35d6d41ab531cce7c1c2d8ae59503885f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 17 Dec 2022 12:24:23 +0100 Subject: [PATCH] Bump to 1.11.3. --- CHANGELOG.md | 2 + build.gradle | 358 +++++++++++++++++++++++++-------------------------- 2 files changed, 181 insertions(+), 179 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec914cb0b..e342af3c1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v1.11.2] - 2022-12-17 + ### Added - Available items indicator in JEI now updates while JEI is open diff --git a/build.gradle b/build.gradle index 9909073a0..46e205d3b 100755 --- a/build.gradle +++ b/build.gradle @@ -1,179 +1,179 @@ -buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } -} - -plugins { - id 'com.matthewprenger.cursegradle' version '1.4.0' -} - -repositories { - maven { - url = "https://dvs1.progwml6.com/files/maven/" - } - maven { - url "https://www.cursemaven.com" - content { - includeGroup "curse.maven" - } - } - maven { - url = "https://maven.theillusivec4.top/" - } -} - -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'eclipse' -apply plugin: 'maven-publish' - -group = 'com.refinedmods' -archivesBaseName = 'refinedstorage' -version = '1.11.2' - -if (System.getenv('GITHUB_SHA') != null) { - version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) -} - -if (System.getenv('RELEASE') != null) { - version = System.getenv('RELEASE').substring(1) // remove 'v' -} - -java.toolchain.languageVersion = JavaLanguageVersion.of(17) - -tasks.withType(JavaCompile) { - options.compilerArgs << "-Xmaxerrs" << "999" -} - -minecraft { - mappings channel: 'official', version: '1.19.2' - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - runs { - client { - workingDirectory project.file('run') - property 'forge.logging.markers', '' - property 'forge.logging.console.level', 'debug' - mods { - refinedstorage { - source sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - mods { - refinedstorage { - source sourceSets.main - } - } - } - - data { - workingDirectory project.file('run') - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - args '--mod', 'refinedstorage', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources') - mods { - refinedstorage { - source sourceSets.main - } - } - } - } -} - -sourceSets { - main.resources.srcDirs += 'src/generated/resources' -} - -processResources { - inputs.property 'version', project.version - filesMatching('META-INF/mods.toml') { - expand 'version': project.version - } -} - -dependencies { - minecraft 'net.minecraftforge:forge:1.19.2-43.1.32' - - compileOnly fg.deobf("mezz.jei:jei-1.19.2-common-api:11.3.0.262") - compileOnly fg.deobf("mezz.jei:jei-1.19.2-forge-api:11.3.0.262") - runtimeOnly fg.deobf("mezz.jei:jei-1.19.2-forge:11.3.0.262") - - compileOnly fg.deobf('curse.maven:mouse-tweaks-60089:3871353') - - compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:3914007') - - runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0") - compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0:api") -} - -jar { - manifest { - attributes([ - "Specification-Title" : "refinedstorage", - "Specification-Vendor" : "refinedmods", - "Specification-Version" : "1", - "Implementation-Title" : project.name, - "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : "refinedmods", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) - } -} - -if (System.getenv("CURSEFORGE_TOKEN") != null) { - curseforge { - apiKey = System.getenv("CURSEFORGE_TOKEN") - project { - id = '243076' - changelog = System.getenv("CHANGELOG") - changelogType = 'markdown' - releaseType = project.version.toString().contains('beta') ? 'beta' : (project.version.toString().contains('alpha') ? 'alpha' : 'release') - addGameVersion "1.19.2" - mainArtifact(jar) { - displayName = "v$project.version" - } - } - } -} - -jar.finalizedBy('reobfJar') - -publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - maven { - name = "CreeperHost" - url = uri("https://maven.creeperhost.net/release") - credentials { - username = System.getenv("CREEPERHOST_MAVEN_USERNAME") - password = System.getenv("CREEPERHOST_MAVEN_TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} - -javadoc { - failOnError = false -} +buildscript { + repositories { + maven { url = 'https://maven.minecraftforge.net' } + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + } +} + +plugins { + id 'com.matthewprenger.cursegradle' version '1.4.0' +} + +repositories { + maven { + url = "https://dvs1.progwml6.com/files/maven/" + } + maven { + url "https://www.cursemaven.com" + content { + includeGroup "curse.maven" + } + } + maven { + url = "https://maven.theillusivec4.top/" + } +} + +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'maven-publish' + +group = 'com.refinedmods' +archivesBaseName = 'refinedstorage' +version = '1.11.3' + +if (System.getenv('GITHUB_SHA') != null) { + version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) +} + +if (System.getenv('RELEASE') != null) { + version = System.getenv('RELEASE').substring(1) // remove 'v' +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +tasks.withType(JavaCompile) { + options.compilerArgs << "-Xmaxerrs" << "999" +} + +minecraft { + mappings channel: 'official', version: '1.19.2' + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + runs { + client { + workingDirectory project.file('run') + property 'forge.logging.markers', '' + property 'forge.logging.console.level', 'debug' + mods { + refinedstorage { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + mods { + refinedstorage { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + args '--mod', 'refinedstorage', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources') + mods { + refinedstorage { + source sourceSets.main + } + } + } + } +} + +sourceSets { + main.resources.srcDirs += 'src/generated/resources' +} + +processResources { + inputs.property 'version', project.version + filesMatching('META-INF/mods.toml') { + expand 'version': project.version + } +} + +dependencies { + minecraft 'net.minecraftforge:forge:1.19.2-43.1.32' + + compileOnly fg.deobf("mezz.jei:jei-1.19.2-common-api:11.3.0.262") + compileOnly fg.deobf("mezz.jei:jei-1.19.2-forge-api:11.3.0.262") + runtimeOnly fg.deobf("mezz.jei:jei-1.19.2-forge:11.3.0.262") + + compileOnly fg.deobf('curse.maven:mouse-tweaks-60089:3871353') + + compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:3914007') + + runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0") + compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0:api") +} + +jar { + manifest { + attributes([ + "Specification-Title" : "refinedstorage", + "Specification-Vendor" : "refinedmods", + "Specification-Version" : "1", + "Implementation-Title" : project.name, + "Implementation-Version" : project.jar.archiveVersion, + "Implementation-Vendor" : "refinedmods", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +if (System.getenv("CURSEFORGE_TOKEN") != null) { + curseforge { + apiKey = System.getenv("CURSEFORGE_TOKEN") + project { + id = '243076' + changelog = System.getenv("CHANGELOG") + changelogType = 'markdown' + releaseType = project.version.toString().contains('beta') ? 'beta' : (project.version.toString().contains('alpha') ? 'alpha' : 'release') + addGameVersion "1.19.2" + mainArtifact(jar) { + displayName = "v$project.version" + } + } + } +} + +jar.finalizedBy('reobfJar') + +publishing { + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + maven { + name = "CreeperHost" + url = uri("https://maven.creeperhost.net/release") + credentials { + username = System.getenv("CREEPERHOST_MAVEN_USERNAME") + password = System.getenv("CREEPERHOST_MAVEN_TOKEN") + } + } + } + publications { + gpr(MavenPublication) { + from(components.java) + } + } +} + +javadoc { + failOnError = false +}