diff options
| author | Juuz <6596629+Juuxel@users.noreply.github.com> | 2021-11-16 21:59:17 +0200 |
|---|---|---|
| committer | Juuz <6596629+Juuxel@users.noreply.github.com> | 2021-11-16 21:59:17 +0200 |
| commit | 3f4e6c15db57bfb4fd3f304a80d0a34331c79df3 (patch) | |
| tree | dc8709ec1f7311abcf072a62d3e1c5b045f3bb68 | |
| parent | 30c5163bddb8c2781d367956c2f7018f78281cd8 (diff) | |
| download | LibGui-3f4e6c15db57bfb4fd3f304a80d0a34331c79df3.tar.gz LibGui-3f4e6c15db57bfb4fd3f304a80d0a34331c79df3.tar.bz2 LibGui-3f4e6c15db57bfb4fd3f304a80d0a34331c79df3.zip | |
Update to Minecraft 1.18-pre2 and Java 17
| -rw-r--r-- | build.gradle | 27 | ||||
| -rw-r--r-- | gradle.properties | 8 | ||||
| -rw-r--r-- | src/main/resources/fabric.mod.json | 6 |
3 files changed, 13 insertions, 28 deletions
diff --git a/build.gradle b/build.gradle index 700f589..39c5940 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ plugins { id 'checkstyle' } -sourceCompatibility = JavaVersion.VERSION_16 -targetCompatibility = JavaVersion.VERSION_16 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 if(rootProject.file('private.gradle').exists()) { //Publishing details apply from: 'private.gradle' @@ -22,15 +22,8 @@ configurations { repositories { maven { url "https://server.bbkr.space/artifactory/libs-release" } - /*maven { - url = "https://maven.terraformersmc.com/releases" - content { - includeGroup "com.terraformersmc" - } - }*/ maven { - name = "TerraformersMC archive" - url = "https://maven.terraformersmc.com/releases/" + url = "https://maven.terraformersmc.com/releases" content { includeGroup "com.terraformersmc" } @@ -48,7 +41,7 @@ dependencies { // Using modApi instead of api because of https://github.com/FabricMC/fabric-loom/issues/200 include modApi("io.github.juuxel:libninepatch:${project.libninepatch_version}") - modRuntime(modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { + modLocalRuntime(modCompileOnly("com.terraformersmc:modmenu:$project.modmenu_version") { exclude group: 'net.fabricmc.fabric-api' }) @@ -73,7 +66,7 @@ tasks.withType(JavaCompile) { // 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 options.encoding = "UTF-8" - options.release.set 16 + options.release.set 17 } jar { @@ -105,15 +98,7 @@ javadoc { publishing { publications { maven(MavenPublication) { - artifact(remapJar) { - builtBy remapJar - } - - artifact(sourcesJar) { - builtBy remapSourcesJar - } - - artifact(javadocJar) + from components.java } } diff --git a/gradle.properties b/gradle.properties index 0f14d52..77b9857 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.18-pre1 - yarn_mappings=1.18-pre1+build.7 + minecraft_version=1.18-pre2 + yarn_mappings=1.18-pre2+build.1 loader_version=0.12.5 # Mod Properties - mod_version = 4.3.0 + mod_version = 5.0.0-beta.1 maven_group = io.github.cottonmc archives_base_name = LibGui # Dependencies - fabric_version=0.42.2+1.18 + fabric_version=0.42.4+1.18 jankson_version=4.0.0+j1.2.0 modmenu_version=3.0.0 libninepatch_version=1.1.0 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 291aee8..abca72c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,11 +23,11 @@ "modmenu": ["io.github.cottonmc.cotton.gui.impl.modmenu.ModMenuSupport"] }, "depends": { + "java": ">=17", "fabricloader": ">=0.12.5", - "fabric": "*", - "minecraft": "~1.18-beta.1", + "fabric": ">=0.42.4", + "minecraft": "~1.18-beta.2", "jankson": "^4.0.0", - "fabric-networking-api-v1": "^1.0.0", "libninepatch": "^1.1.0" }, "suggests": { |