diff --git a/build.gradle b/build.gradle index 5b38cc3..f0131dd 100644 --- a/build.gradle +++ b/build.gradle @@ -28,16 +28,10 @@ dependencies { } processResources { - inputs.property "version", project.version - duplicatesStrategy = 'warn' + inputs.property 'version', version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - expand "version": project.version - } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" + filesMatching('quilt.mod.json') { + expand "version": version } } @@ -45,49 +39,14 @@ tasks.withType(JavaCompile) { options.encoding = "UTF-8" } -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource +java { + withSourcesJar() } jar { from "LICENSE" } -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } - } - } - - // select the repositories you want to publish to - repositories { - // uncomment to publish to the local maven - // mavenLocal() - } -} - -sourceSets { - main.java { - include 'com/vladmarica/betterpingdisplay/**/*' - exclude 'net/fabricmc/*' - } - test.java { - include 'com/vladmarica/betterpingdisplay/**/*' - } -} - test { useJUnit() } diff --git a/gradle.properties b/gradle.properties index 154a327..cd0085a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,23 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs=-Xmx3G # Fabric Properties - # check these on https://fabricmc.net/use - minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.28 - loader_version=0.14.10 +# check these on https://fabricmc.net/develop +minecraft_version=1.19.3 +yarn_mappings=1.19.3+build.3 +loader_version=0.14.11 # Mod Properties - mod_version = 1.2.0 - maven_group = com.vladmarica - archives_base_name = BetterPingDisplay-Fabric +mod_version=1.2.0 +maven_group=com.vladmarica +archives_base_name=BetterPingDisplay-Fabric # Dependencies - # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.67.1+1.19.2 - # ModMenu api - modmenu_version=4.1.1 - # Cloth config for config screen - cloth_config_version=8.2.88 +# check these on https://fabricmc.net/develop +fabric_version=0.68.1+1.19.3 + +# ModMenu api +modmenu_version=5.0.2 + +# Cloth config for config screen +cloth_config_version=8.2.88 diff --git a/src/main/resources/betterpingdisplay.mixins.json b/src/main/resources/betterpingdisplay.mixins.json index 0fe092b..0366dcc 100644 --- a/src/main/resources/betterpingdisplay.mixins.json +++ b/src/main/resources/betterpingdisplay.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.vladmarica.betterpingdisplay.mixin", - "compatibilityLevel": "JAVA_8", + "compatibilityLevel": "JAVA_17", "mixins": [ ], "client": [ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 877e902..7a4181a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "betterpingdisplay", - "version": "1.1.1", + "version": "${version}", "name": "Better Ping Display", "description": "Shows the actual ping number instead of just bars in the player list!", @@ -32,7 +32,7 @@ "depends": { "fabricloader": ">=0.14", - "minecraft": "1.19.2" + "minecraft": "1.19.3" }, "suggests": {} }