diff --git a/Fabric/build.gradle b/Fabric/build.gradle index ecff05d..f8dc62f 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'maven-publish' id 'idea' - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' } base { archivesName = "${mod_id}-fabric-${minecraft_version}" diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle index b6c197a..36c084b 100644 --- a/NeoForge/build.gradle +++ b/NeoForge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.145' + id 'net.neoforged.gradle.userdev' version '7.0.160' id 'java-library' } diff --git a/build.gradle b/build.gradle index b3b3272..82e9013 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,18 @@ subprojects { java.toolchain.languageVersion = JavaLanguageVersion.of(21) java.withSourcesJar() java.withJavadocJar() - + + configurations.all { + resolutionStrategy { + // Force the version of ASM that NeoForge wants (9.8 in your error log) + force 'org.ow2.asm:asm-analysis:9.8' + force 'org.ow2.asm:asm:9.8' + force 'org.ow2.asm:asm-tree:9.8' + force 'org.ow2.asm:asm-commons:9.8' + force 'org.ow2.asm:asm-util:9.8' + } + } + jar { from(rootProject.file("LICENSE")) { rename { "${it}_${mod_id}" } diff --git a/gradle.properties b/gradle.properties index 981ead4..bfa93e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -version=2.2.3 +version=2.2.4 group=tschipp.carryon # Common @@ -10,21 +10,21 @@ mod_id=carryon license=GNU LGPLv3 credits= description=Carry On is a simple mod that improves game interaction by allowing players to pick up, carry, and place single block Tile Entities using only their empty hands. -minecraft_version_range=[1.21, 1.22) +minecraft_version_range=[1.21.1, 1.21.2) # Forge -forge_version=52.0.4 +forge_version=52.1.0 forge_loader_version_range=[52,) forge_version_range=[52,) parchment_mappings=2024.07.28-1.21 //forge_ats_enabled=true # Fabric -fabric_version=0.102.1+1.21.1 +fabric_version=0.116.7+1.21.1 fabric_loader_version=0.16.2 parchment_mappings_fabric=1.21:2024.07.28 # Neoforge -neoforge_version=21.1.20 +neoforge_version=21.1.217 neoforge_loader_version_range=[4,) neogradle.subsystems.parchment.minecraftVersion=1.21 neogradle.subsystems.parchment.mappingsVersion=2024.07.28 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ