Skip to content

Commit

Permalink
update dependencies for 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
UpcraftLP committed Jul 21, 2024
1 parent 9b912fc commit 507f617
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 77 deletions.
20 changes: 10 additions & 10 deletions Common/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
[versions]
minecraft = "1.20.4"
minecraft = "1.21"

# The latest versions are available at https://parchmentmc.org/docs/getting-started
parchment_minecraft = "1.20.4"
parchment_mappings = "2024.04.14"
parchment_minecraft = "1.21"
parchment_mappings = "2024.07.07"

mixin = "0.8.5"
mixin_extras = "0.3.5"
asm = "9.6"
jetbrains_annotations = "24.1.0"
vanilla_gradle = "0.2.1-SNAPSHOT"

commonnetworking = "1.0.11-beta.1-1.20.4"
resourcefulconfig = "2.4.7"
emi = "1.1.10+1.20.4"
commonnetworking = "1.0.11-1.21"
resourcefulconfig = "3.0.3"
emi = "1.1.10+1.21"

figura = "0.1.4+1.20.2"
luaj = "3.0.8-figura"
nv_websocket = "2.14"

[libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
parchment_mappings = { module = "org.parchmentmc.data:parchment-1.20.4", version.ref = "parchment_mappings" }
parchment_mappings = { module = "org.parchmentmc.data:parchment-1.21", version.ref = "parchment_mappings" }
mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
mixin_extras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixin_extras" }
mixin_extras_forge = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixin_extras" }
Expand All @@ -32,9 +32,9 @@ asm_tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
asm_util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
jetbrains_annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains_annotations" }

resourcefulconfig = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-common-1.20.4", version.ref = "resourcefulconfig" }
resourcefulconfig_fabric = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-fabric-1.20.4", version.ref = "resourcefulconfig" }
resourcefulconfig_neoforge = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-neoforge-1.20.4", version.ref = "resourcefulconfig" }
resourcefulconfig = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-common-1.21", version.ref = "resourcefulconfig" }
resourcefulconfig_fabric = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-fabric-1.21", version.ref = "resourcefulconfig" }
resourcefulconfig_neoforge = { module = "com.teamresourceful.resourcefulconfig:resourcefulconfig-neoforge-1.21", version.ref = "resourcefulconfig" }

commonnetworking = { module = "mysticdrew:common-networking-common", version.ref = "commonnetworking" }
commonnetworking_fabric = { module = "mysticdrew:common-networking-fabric", version.ref = "commonnetworking" }
Expand Down
10 changes: 5 additions & 5 deletions Fabric/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# The latest versions are available at https://fabricmc.net/develop/

fabric_loader = "0.15.11"
fabric_api = "0.97.1+1.20.4"
fabric_api = "0.100.7+1.21"

trinkets = "3.8.1"
cca = "5.4.0"
trinkets = "3.10.0"
cca = "6.1.1"

cameraoverhaul = "5441071" # 1.4.1
cloth = "13.0.121"
cloth = "15.0.127"

modmenu = "9.2.0"
modmenu = "11.0.1"

[libraries]
fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
Expand Down
4 changes: 4 additions & 0 deletions NeoForge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ if(usingJarJar) {
}

repositories {
maven {
name = "OctoStudios"
url = "https://maven.octo-studios.com/releases"
}
maven {
name = "TheIllusiveC4"
url = "https://maven.theillusivec4.top"
Expand Down
10 changes: 5 additions & 5 deletions NeoForge/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[versions]
neogradle = "7.0.120"
neogradle = "7.0.155"

neoforge = "20.4.237"
neoforge = "21.0.113-beta"

curios = "7.4.3+1.20.4"
curios = "9.0.5+1.21"

caelus = "5.1.0+1.20.4"
caelus = "7.0.0+1.21"

cameraoverhaul = "5416786"
cameraoverhaul = "5517123" # 1.1

[libraries]
neoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
Expand Down
52 changes: 0 additions & 52 deletions NeoForge/src/main/resources/META-INF/mods.toml

This file was deleted.

52 changes: 52 additions & 0 deletions NeoForge/src/main/resources/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
modLoader = "javafml" #mandatory
loaderVersion = "*" #mandatory
license = "${license_url}" # Review your options at https://choosealicense.com/.
issueTrackerURL = "${issues_url}" #optional

[[mods]] #mandatory
modId = "${mod_id}" #mandatory
version = "${version}" #mandatory
displayName = "${mod_display_name}" #mandatory
displayURL = "${homepage_url}" #optional (displayed in the mod UI)
logoFile = "icon.png" #optional
#credits = "" #optional
authors = "Cammie, Up" #optional
description = '''${mod_description}''' #mandatory (Supports multiline text)

[[mixins]]
config = "${mod_id}.mixins.json"

[[mixins]]
config = "${mod_id}.neoforge.mixins.json"

[[accessTransformers]]
file = "META-INF/accesstransformer.cfg"

# https://docs.neoforged.net/docs/gettingstarted/modfiles#dependency-configurations
[dependencies]
"${mod_id}" = [
{ modId = "neoforge", type = 'required', versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { ignore = true } },
{ modId = "minecraft", type = 'required', versionRange = "[${minecraft_version}]", ordering = "NONE", side = "BOTH" },
{ modId = "curios", type = 'required', versionRange = "[9.0.0,)", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "1037991", modrinth = "BaqCltvf" } },
{ modId = "caelus", type = 'required', versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "308989", modrinth = "40FYwb4z" } },
{ modId = "resourcefulconfig", type = 'required', versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "714059", modrinth = "M1953qlQ" } },
{ modId = "commonnetworking", type = 'required', versionRange = "*", ordering = "NONE", side = "BOTH", mc-publish = { curseforge = "806044", modrinth = "HIuqnQpi" } },
{ modId = "camera_overhaul_neoforge", type = 'optional', versionRange = "[1.1,)", ordering = "NONE", side = "CLIENT", mc-publish = { curseforge = "1011593", modrinth = "LwcpSm6L" } }
]

# Features are specific properties of the game environment, that you may want to declare you require. This example declares
# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
# stop your mod loading on the server for example.
#[features.${mod_id}]
#openGLVersion="[3.2,)"

[mc-publish]
curseforge = "${curseforge_id}"
modrinth = "${modrinth_id}"
loaders = [
"neoforge"
]
dependencies = [
"camera_overhaul_neoforge(optional){modrinth:LwcpSm6L}{curseforge:1011593}",
"figura(optional){modrinth:s9gIPDom}{curseforge:901503}"
]
9 changes: 5 additions & 4 deletions Quilt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ dependencies {
})

modImplementation quilt.quilt.loader
modImplementation quilt.quilted.fabric.api
modRuntimeOnly(quilt.quilted.fabric.api.deprecated) {
transitive = false
}
modImplementation fabric.fabric.api
// modImplementation quilt.quilted.fabric.api
// modRuntimeOnly(quilt.quilted.fabric.api.deprecated) {
// transitive = false
// }

compileOnly project(":Common")

Expand Down
2 changes: 1 addition & 1 deletion Quilt/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
quilt_loom = "1.7.+"

quilt_loader = "0.26.4-beta.1"
quilted_fabric_api = "9.0.0-alpha.8+0.97.0-1.20.4"
quilted_fabric_api = "11.0.0-alpha.3+0.100.7-1.21"

[libraries]
quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" }
Expand Down

0 comments on commit 507f617

Please sign in to comment.