diff --git a/Forge/build.gradle b/Forge/build.gradle index e52a786..e7abbb4 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -4,21 +4,16 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } gradlePluginPortal() } - dependencies { - classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT' - } } plugins { id 'eclipse' id 'idea' - id 'net.minecraftforge.gradle' version '[6.0.24,6.2)' + id 'net.minecraftforge.gradle' version '[7.0.17,8)' id "com.modrinth.minotaur" version "2.+" id "com.matthewprenger.cursegradle" version "1.4.0" } -apply plugin: 'org.spongepowered.mixin' - mixin { add sourceSets.main, "nochatrestrictions.refmap.json" } @@ -27,8 +22,8 @@ version = project.modVersion group = 'com.aizistral.nochatrestrictions' archivesBaseName = 'NoChatRestrictions' -// Mojang ships Java 21 to end users in 1.20.5+, so your mod should target Java 21. -java.toolchain.languageVersion = JavaLanguageVersion.of(21) +// Mojang ships Java 25 to end users in 26.1+, so your mod should target Java 25. +java.toolchain.languageVersion = JavaLanguageVersion.of(25) tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation @@ -71,19 +66,17 @@ minecraft { } repositories { + minecraft.mavenizer(it) + maven fg.forgeMaven + maven fg.minecraftLibsMaven maven { url = "https://repo.spongepowered.org/maven" } mavenCentral() jcenter() } dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - annotationProcessor 'org.spongepowered:mixin:0.8.4:processor' - annotationProcessor 'com.google.code.gson:gson:2.8.0' - annotationProcessor 'com.google.guava:guava:21.0' - annotationProcessor 'org.ow2.asm:asm-tree:7.2' - annotationProcessor 'org.ow2.asm:asm-commons:7.2' - annotationProcessor 'org.ow2.asm:asm-util:7.2' + implementation minecraft.dependency("net.minecraftforge:forge:$minecraft_version-$forge_version") + annotationProcessor 'org.spongepowered:mixin:0.8.7:processor' } jar { diff --git a/Forge/settings.gradle b/Forge/settings.gradle index b4fdadb..3e187fe 100644 --- a/Forge/settings.gradle +++ b/Forge/settings.gradle @@ -1,18 +1,3 @@ -pluginManagement { - repositories { - maven { url = uri("${rootDir}/deps") } - gradlePluginPortal() - maven { - name = 'MinecraftForge' - url = 'https://maven.minecraftforge.net/' - } - maven { - url = 'https://repo.spongepowered.org/repository/maven-public/' - content { includeGroup "org.spongepowered" } - } - } -} - plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' -} + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} \ No newline at end of file