diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 29fe60c..f20c3c9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ env: Java 17 Java 18 GAME_VERSIONS: | - 1.19.4 + 1.20 FABRIC_DEPENDENCIES: | fabric-api | depends | * friends-and-foes | depends | * diff --git a/CHANGELOG.md b/CHANGELOG.md index 8384c40..a5ca367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## mc1.20-1.1.0, June 11, 2023 + +- Ported to 1.20 + ## mc1.19.4-1.0.0, March 20, 2023 - Ported to 1.19.4 diff --git a/fabric/build.gradle b/fabric/build.gradle index b70b3f0..6766cb0 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -35,10 +35,7 @@ dependencies { // For faster development https://www.cursemaven.com/ // https://www.curseforge.com/minecraft/mc-mods/lazydfu/files modRuntimeOnly "curse.maven:lazydfu-433518:3821870" - // https://www.curseforge.com/minecraft/mc-mods/starlight/files - modRuntimeOnly "curse.maven:starlight-521783:3835973" - modRuntimeOnly "curse.maven:disablecustomworldsadvice-401978:4444372" - modRuntimeOnly "curse.maven:friendsandfoes-551364:4447712" + modRuntimeOnly "curse.maven:friendsandfoes-551364:4573647" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 06a2233..0ae714e 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -24,9 +24,9 @@ }, "depends": { "java": ">=17", - "minecraft": ">=1.19.4", + "minecraft": ">=1.20", "fabric": "*", "fabricloader": "*", - "friendsandfoes": ">=1.8.0" + "friendsandfoes": ">=1.9.0" } } \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index eb3794c..e5963b0 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -22,7 +22,7 @@ configurations { dependencies { forge "net.minecraftforge:forge:${rootProject.forge_version}" - modRuntimeOnly "curse.maven:friendsandfoes-forge-602059:4447710" + modRuntimeOnly "curse.maven:friendsandfoes-forge-602059:4573649" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 266ad52..b5c5613 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -15,20 +15,20 @@ displayURL = "https://www.curseforge.com/minecraft/mc-mods/friends-and-foes-flow [[dependencies.flowerymooblooms]] modId = "forge" mandatory = true -versionRange = "[45.0.9,)" +versionRange = "[46,)" ordering = "NONE" side = "BOTH" [[dependencies.flowerymooblooms]] modId = "minecraft" mandatory = true -versionRange = "[1.19.4,)" +versionRange = "[1.20,)" ordering = "NONE" side = "BOTH" [[dependencies.flowerymooblooms]] modId = "friendsandfoes" mandatory = true -versionRange = "[1.8.0,)" +versionRange = "[1.9.0,)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index 3fd84f8..9ef4f2c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,16 +8,16 @@ org.gradle.configureondemand=false # Mod mod_name=Friends&Foes - Flowery Mooblooms mod_id=friendsandfoes.flowerymooblooms -mod_version=1.0.0 +mod_version=1.1.0 mod_author=Faboslav mod_description=An addon for the Friends&Foes mod, adding one moobloom variant for each flower. maven_group=com.faboslav.friendsandfoes.flowerymooblooms #Minecraft -minecraft_version=1.19.4 +minecraft_version=1.20 #Mappings -yarn_mappings=1.19.4+build.1:v2 +yarn_mappings=1.20+build.1:v2 # Architectury enabled_platforms=fabric,forge,quilt @@ -26,12 +26,12 @@ enabled_platforms=fabric,forge,quilt mixin_extras_version=0.1.1 # Fabric https://fabricmc.net/versions.html -fabric_loader_version=0.14.17 -fabric_api_version=0.76.0+1.19.4 +fabric_loader_version=0.14.21 +fabric_api_version=0.83.0+1.20 # Forge https://files.minecraftforge.net/net/minecraftforge/forge/index_1.19.4.html -forge_version=1.19.4-45.0.9 +forge_version=1.20-46.0.1 # Quilt https://lambdaurora.dev/tools/import_quilt.html -quilt_loader_version=0.18.5 -quilt_fabric_api_version=6.0.0-beta.2+0.76.0-1.19.4 \ No newline at end of file +quilt_loader_version=0.19.0-beta.18 +quilt_fabric_api_version=7.0.1+0.83.0-1.20 diff --git a/quilt/build.gradle b/quilt/build.gradle index 9d1f461..7ea01cd 100644 --- a/quilt/build.gradle +++ b/quilt/build.gradle @@ -32,7 +32,7 @@ dependencies { annotationProcessor("com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras_version}") include("com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras_version}") - modRuntimeOnly "curse.maven:friendsandfoes-quilt-628248:4447711" + modRuntimeOnly "curse.maven:friendsandfoes-quilt-628248:4579632" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionQuilt")) { transitive false } diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json index 248da71..84514e8 100644 --- a/quilt/src/main/resources/quilt.mod.json +++ b/quilt/src/main/resources/quilt.mod.json @@ -32,7 +32,7 @@ }, { "id": "minecraft", - "version": ">=1.19.4" + "version": ">=1.20" }, { "id": "quilt_loader", @@ -44,7 +44,7 @@ }, { "id": "friendsandfoes", - "version": ">=1.8.0" + "version": ">=1.9.0" } ] }