Update to 1.20.2
This commit is contained in:
parent
969eaf92bc
commit
59161400e8
@ -21,9 +21,9 @@
|
|||||||
},
|
},
|
||||||
"mixins": [],
|
"mixins": [],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": "^0.14.12",
|
"fabricloader": "^${loaderVersion}",
|
||||||
"fabric-api": "*",
|
"fabric-api": "*",
|
||||||
"minecraft": "1.19.3",
|
"minecraft": "${minecraftVersion}",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,9 +21,9 @@
|
|||||||
},
|
},
|
||||||
"mixins": [],
|
"mixins": [],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": "^0.14.12",
|
"fabricloader": "^${loaderVersion}",
|
||||||
"fabric-api": "*",
|
"fabric-api": "*",
|
||||||
"minecraft": "1.19.3",
|
"minecraft": "${minecraftVersion}",
|
||||||
"java": ">=17",
|
"java": ">=17",
|
||||||
"toolbox-core": "${version}"
|
"toolbox-core": "${version}"
|
||||||
}
|
}
|
||||||
|
@ -25,9 +25,9 @@
|
|||||||
"Pagination.mixins.json"
|
"Pagination.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": "^0.14.12",
|
"fabricloader": "^${loaderVersion}",
|
||||||
"fabric-api": "*",
|
"fabric-api": "*",
|
||||||
"minecraft": "1.19.3",
|
"minecraft": "${minecraftVersion}",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,9 +25,9 @@
|
|||||||
"Task.mixins.json"
|
"Task.mixins.json"
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": "^0.14.12",
|
"fabricloader": "^${loaderVersion}",
|
||||||
"fabric-api": "*",
|
"fabric-api": "*",
|
||||||
"minecraft": "1.19.3",
|
"minecraft": "${minecraftVersion}",
|
||||||
"java": ">=17"
|
"java": ">=17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
30
build.gradle
30
build.gradle
@ -1,7 +1,7 @@
|
|||||||
import fr.altarik.ReportDiscord
|
import fr.altarik.ReportDiscord
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '1.2-SNAPSHOT' apply false
|
id 'fabric-loom' version '1.4-SNAPSHOT' apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
Properties local = new Properties()
|
Properties local = new Properties()
|
||||||
@ -24,9 +24,6 @@ allprojects {
|
|||||||
|
|
||||||
group = project.maven_group
|
group = project.maven_group
|
||||||
version = project.maven_version
|
version = project.maven_version
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
@ -64,26 +61,17 @@ allprojects {
|
|||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
inputs.property "version", project.version
|
inputs.property "version", project.version
|
||||||
|
inputs.property "minecraftVersion", project.minecraft_version
|
||||||
|
inputs.property "loaderVersion", project.loader_version
|
||||||
|
|
||||||
filesMatching("fabric.mod.json") {
|
filesMatching("fabric.mod.json") {
|
||||||
expand "version": project.version
|
expand inputs.properties
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile).configureEach {
|
tasks.withType(JavaCompile).configureEach {
|
||||||
// ensure that the encoding is set to UTF-8, no matter what the system default is
|
|
||||||
// this fixes some edge cases with special characters not displaying correctly
|
|
||||||
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
|
|
||||||
// If Javadoc is generated, this must be specified in that task too.
|
|
||||||
it.options.encoding = "UTF-8"
|
it.options.encoding = "UTF-8"
|
||||||
|
it.options.release = 17
|
||||||
// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
|
|
||||||
// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
|
|
||||||
// We'll use that if it's available, but otherwise we'll use the older option.
|
|
||||||
def targetVersion = 17
|
|
||||||
if (JavaVersion.current().isJava9Compatible()) {
|
|
||||||
it.options.release = targetVersion
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@ -98,6 +86,9 @@ allprojects {
|
|||||||
java {
|
java {
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
withJavadocJar()
|
withJavadocJar()
|
||||||
|
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
@ -107,8 +98,11 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation project(path: ":Core", configuration: "namedElements")
|
||||||
|
implementation project(path: ":Database", configuration: "namedElements")
|
||||||
|
implementation project(path: ":Pagination", configuration: "namedElements")
|
||||||
|
implementation project(path: ":Tasks", configuration: "namedElements")
|
||||||
include subprojects.collect { project -> project }
|
include subprojects.collect { project -> project }
|
||||||
implementation subprojects.collect { project -> project }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static def getEnv(String envName, String defaultValue) {
|
static def getEnv(String envName, String defaultValue) {
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx1G
|
||||||
fabric.loom.multiProjectOptimisation=true
|
fabric.loom.multiProjectOptimisation=true
|
||||||
|
|
||||||
junit_version=5.9.0
|
junit_version=5.9.0
|
||||||
minecraft_version=1.19.3
|
minecraft_version=1.20.2
|
||||||
yarn_mappings=1.19.3+build.5
|
yarn_mappings=1.20.2+build.4
|
||||||
loader_version=0.14.14
|
loader_version=0.15.3
|
||||||
fabric_version=0.75.1+1.19.3
|
fabric_version=0.91.3+1.20.2
|
||||||
|
|
||||||
maven_group=fr.altarik.toolbox
|
maven_group=fr.altarik.toolbox
|
||||||
maven_version=4.3.2-SNAPSHOT
|
maven_version=4.3.2-SNAPSHOT
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
"icon": "assets/toolbox/icon.png",
|
"icon": "assets/toolbox/icon.png",
|
||||||
"environment": "*",
|
"environment": "*",
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": "^0.14.12",
|
"fabricloader": "^${loaderVersion}",
|
||||||
"fabric-api": "*",
|
"fabric-api": "*",
|
||||||
"minecraft": "1.19.3",
|
"minecraft": "${minecraftVersion}",
|
||||||
"java": ">=17",
|
"java": ">=17",
|
||||||
"toolbox-core": "${version}",
|
"toolbox-core": "${version}",
|
||||||
"toolbox-database": "${version}",
|
"toolbox-database": "${version}",
|
||||||
|
Loading…
Reference in New Issue
Block a user