dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump to 1.11.3.

Browse Source
This commit is contained in:
raoulvdberge
2022-12-17 12:24:23 +01:00
parent aaf528bce2
commit 9136fea35d
2 changed files with 181 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
## [v1.11.2] - 2022-12-17
### Added ### Added
- Available items indicator in JEI now updates while JEI is open - Available items indicator in JEI now updates while JEI is open

358
build.gradle
View File

@@ -1,179 +1,179 @@
buildscript { buildscript {
repositories { repositories {
maven { url = 'https://maven.minecraftforge.net' } maven { url = 'https://maven.minecraftforge.net' }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
} }
} }
plugins { plugins {
id 'com.matthewprenger.cursegradle' version '1.4.0' id 'com.matthewprenger.cursegradle' version '1.4.0'
} }
repositories { repositories {
maven { maven {
url = "https://dvs1.progwml6.com/files/maven/" url = "https://dvs1.progwml6.com/files/maven/"
} }
maven { maven {
url "https://www.cursemaven.com" url "https://www.cursemaven.com"
content { content {
includeGroup "curse.maven" includeGroup "curse.maven"
} }
} }
maven { maven {
url = "https://maven.theillusivec4.top/" url = "https://maven.theillusivec4.top/"
} }
} }
apply plugin: 'net.minecraftforge.gradle' apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
group = 'com.refinedmods' group = 'com.refinedmods'
archivesBaseName = 'refinedstorage' archivesBaseName = 'refinedstorage'
version = '1.11.2' version = '1.11.3'
if (System.getenv('GITHUB_SHA') != null) { if (System.getenv('GITHUB_SHA') != null) {
version += '+' + System.getenv('GITHUB_SHA').substring(0, 7) version += '+' + System.getenv('GITHUB_SHA').substring(0, 7)
} }
if (System.getenv('RELEASE') != null) { if (System.getenv('RELEASE') != null) {
version = System.getenv('RELEASE').substring(1) // remove 'v' version = System.getenv('RELEASE').substring(1) // remove 'v'
} }
java.toolchain.languageVersion = JavaLanguageVersion.of(17) java.toolchain.languageVersion = JavaLanguageVersion.of(17)
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-Xmaxerrs" << "999" options.compilerArgs << "-Xmaxerrs" << "999"
} }
minecraft { minecraft {
mappings channel: 'official', version: '1.19.2' mappings channel: 'official', version: '1.19.2'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
runs { runs {
client { client {
workingDirectory project.file('run') workingDirectory project.file('run')
property 'forge.logging.markers', '' property 'forge.logging.markers', ''
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
mods { mods {
refinedstorage { refinedstorage {
source sourceSets.main source sourceSets.main
} }
} }
} }
server { server {
workingDirectory project.file('run') workingDirectory project.file('run')
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
mods { mods {
refinedstorage { refinedstorage {
source sourceSets.main source sourceSets.main
} }
} }
} }
data { data {
workingDirectory project.file('run') workingDirectory project.file('run')
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
args '--mod', 'refinedstorage', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources') args '--mod', 'refinedstorage', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources')
mods { mods {
refinedstorage { refinedstorage {
source sourceSets.main source sourceSets.main
} }
} }
} }
} }
} }
sourceSets { sourceSets {
main.resources.srcDirs += 'src/generated/resources' main.resources.srcDirs += 'src/generated/resources'
} }
processResources { processResources {
inputs.property 'version', project.version inputs.property 'version', project.version
filesMatching('META-INF/mods.toml') { filesMatching('META-INF/mods.toml') {
expand 'version': project.version expand 'version': project.version
} }
} }
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.19.2-43.1.32' 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-common-api:11.3.0.262")
compileOnly fg.deobf("mezz.jei:jei-1.19.2-forge-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") 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:mouse-tweaks-60089:3871353')
compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:3914007') compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:3914007')
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0") 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") compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0:api")
} }
jar { jar {
manifest { manifest {
attributes([ attributes([
"Specification-Title" : "refinedstorage", "Specification-Title" : "refinedstorage",
"Specification-Vendor" : "refinedmods", "Specification-Vendor" : "refinedmods",
"Specification-Version" : "1", "Specification-Version" : "1",
"Implementation-Title" : project.name, "Implementation-Title" : project.name,
"Implementation-Version" : project.jar.archiveVersion, "Implementation-Version" : project.jar.archiveVersion,
"Implementation-Vendor" : "refinedmods", "Implementation-Vendor" : "refinedmods",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
]) ])
} }
} }
if (System.getenv("CURSEFORGE_TOKEN") != null) { if (System.getenv("CURSEFORGE_TOKEN") != null) {
curseforge { curseforge {
apiKey = System.getenv("CURSEFORGE_TOKEN") apiKey = System.getenv("CURSEFORGE_TOKEN")
project { project {
id = '243076' id = '243076'
changelog = System.getenv("CHANGELOG") changelog = System.getenv("CHANGELOG")
changelogType = 'markdown' changelogType = 'markdown'
releaseType = project.version.toString().contains('beta') ? 'beta' : (project.version.toString().contains('alpha') ? 'alpha' : 'release') releaseType = project.version.toString().contains('beta') ? 'beta' : (project.version.toString().contains('alpha') ? 'alpha' : 'release')
addGameVersion "1.19.2" addGameVersion "1.19.2"
mainArtifact(jar) { mainArtifact(jar) {
displayName = "v$project.version" displayName = "v$project.version"
} }
} }
} }
} }
jar.finalizedBy('reobfJar') jar.finalizedBy('reobfJar')
publishing { publishing {
repositories { repositories {
maven { maven {
name = "GitHubPackages" name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage") url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage")
credentials { credentials {
username = System.getenv("GITHUB_ACTOR") username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN") password = System.getenv("GITHUB_TOKEN")
} }
} }
maven { maven {
name = "CreeperHost" name = "CreeperHost"
url = uri("https://maven.creeperhost.net/release") url = uri("https://maven.creeperhost.net/release")
credentials { credentials {
username = System.getenv("CREEPERHOST_MAVEN_USERNAME") username = System.getenv("CREEPERHOST_MAVEN_USERNAME")
password = System.getenv("CREEPERHOST_MAVEN_TOKEN") password = System.getenv("CREEPERHOST_MAVEN_TOKEN")
} }
} }
} }
publications { publications {
gpr(MavenPublication) { gpr(MavenPublication) {
from(components.java) from(components.java)
} }
} }
} }
javadoc { javadoc {
failOnError = false failOnError = false
} }