diff --git a/build.gradle b/build.gradle index 5549bf2d..a014313b 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ repositories { maven { url 'https://jitpack.io' } maven { url 'https://maven.terraformersmc.com/releases' } maven { url = "https://maven.terraformersmc.com/" } - maven { url "https://ladysnake.jfrog.io/artifactory/mods" } + maven { url "https://maven.ladysnake.org/releases" } maven { url = "https://dvs1.progwml6.com/files/maven/" } maven { url = "https://modmaven.dev" } exclusiveContent { @@ -97,8 +97,8 @@ dependencies { //needed for trinkets, otherwise BetterEnd would require users to install trinkets modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}" modCompileOnly "dev.emi:trinkets:${project.trinkets_version}" - modCompileOnly "dev.emi:emi:${emi_version}" - //modRuntimeOnly "dev.emi:emi:${emi_version}" + modCompileOnly "dev.emi:emi-fabric:${emi_version}:api" + modLocalRuntime "dev.emi:emi-fabric:${emi_version}" } processResources { @@ -345,4 +345,43 @@ curseforge { debug = false forgeGradleIntegration = false } -} \ No newline at end of file +} + + + +task nextVersion() { + doLast { + def inputFile = new File('modrinth.json') + def gameVersions = java.net.URLEncoder.encode(project.modrinth_versions, "UTF-8") + new URL("https://api.modrinth.com/v2/project/${project.modrinth_base_name}/version?&game_versions=${gameVersions}").withInputStream { i -> inputFile.withOutputStream { it << i } } + + def json = new groovy.json.JsonSlurper().parseText(inputFile.text) + def version = json[0].version_number + + //increment patch version + def indexedVersionList = version.split(/\./).toList().withIndex() + indexedVersionList = indexedVersionList.collect { num, idx -> num.toInteger() } + indexedVersionList[2] = indexedVersionList[2].value + 1 + def updatedVersion = indexedVersionList.join(".") + + println "\n\n" + println "------------- CURRENT VERSION -------------" + println "Last Published Version: " + version + println " Game Versions: " + json[0].game_versions + println " Status: " + json[0].status + println " Featured: " + json[0].featured + println " Downloaded: " + json[0].downloads + println "\n" + println "-------------- NEXT VERSION ---------------" + println "Next Version: " + updatedVersion + println "\n\n" + + def propertiesFile = new File("gradle.properties") + def newContents = propertiesFile.text.replaceFirst("mod_version=\\d+.\\d+.\\d+", "mod_version=${updatedVersion}") + propertiesFile.text = newContents + + def fabricFile = new File("src/main/resources/fabric.mod.json") + newContents = fabricFile.text.replaceFirst('"version": ".+"', "\"version\": \"${updatedVersion}\"") + fabricFile.text = newContents + } +} diff --git a/gradle.properties b/gradle.properties index a68197e1..828427b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,13 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/versions.html minecraft_version=1.19.3 -loader_version=0.14.11 -fabric_version=0.68.1+1.19.3 +loader_version=0.15.3 +fabric_version=0.76.1+1.19.3 #Loom loom_version=1.0-SNAPSHOT #Modrinth modrinth_versions=["1.19.3"] +modrinth_base_name=betterend #`release`, `beta` or `alpha` release_channel=beta modrinth_id=betterend @@ -21,6 +22,6 @@ archives_base_name=better-end patchouli_version=1.19.3-78-FABRIC bclib_version=2.2.5 rei_version=10.0.578 -emi_version=0.6.2+1.19.3 +emi_version=1.0.29+1.19.3 trinkets_version=3.5.1 cca_version=5.1.0 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 531c5cba..0f521037 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "betterend", - "version": "${version}", + "version": "3.1.4", "name": "Better End", "description": "More content for The End dimension, including new biomes, plants, mobs, mechanics, terrain generation and more.\nMade by:\n- paulevs (code & art)\n- Bulldog83 (code & art)\n- Edos (building)\n- Yuki (art)\n- Seaward (art)\n- Firel (music)\n", "authors": [