Skip to content

Commit

Permalink
1.20 Port
Browse files Browse the repository at this point in the history
  • Loading branch information
Faboslav committed Jun 11, 2023
1 parent c5704f8 commit a857f18
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 | *
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
},
"depends": {
"java": ">=17",
"minecraft": ">=1.19.4",
"minecraft": ">=1.20",
"fabric": "*",
"fabricloader": "*",
"friendsandfoes": ">=1.8.0"
"friendsandfoes": ">=1.9.0"
}
}
2 changes: 1 addition & 1 deletion forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 3 additions & 3 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
quilt_loader_version=0.19.0-beta.18
quilt_fabric_api_version=7.0.1+0.83.0-1.20
2 changes: 1 addition & 1 deletion quilt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions quilt/src/main/resources/quilt.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
{
"id": "minecraft",
"version": ">=1.19.4"
"version": ">=1.20"
},
{
"id": "quilt_loader",
Expand All @@ -44,7 +44,7 @@
},
{
"id": "friendsandfoes",
"version": ">=1.8.0"
"version": ">=1.9.0"
}
]
}
Expand Down

0 comments on commit a857f18

Please sign in to comment.