diff --git a/build.gradle b/build.gradle index 6d0d052..47c283b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.15-SNAPSHOT' + id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT' id 'maven-publish' } @@ -10,17 +10,20 @@ base { archivesName = project.archives_base_name } - repositories { - + mavenCentral() + maven { url 'https://maven.wispforest.io/releases/' } + maven { url 'https://jitpack.io' } + maven { url = "https://cursemaven.com" } } dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + implementation "curse.maven:modern-ui-352491:8206272" } processResources { @@ -36,12 +39,8 @@ processResources { } } -def targetJavaVersion = 21 +def targetJavaVersion = 25 tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { it.options.release.set(targetJavaVersion) @@ -53,9 +52,6 @@ java { if (JavaVersion.current() < javaVersion) { toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) } - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. withSourcesJar() } @@ -65,7 +61,6 @@ jar { } } -// configure the maven publication publishing { publications { create("mavenJava", MavenPublication) { @@ -74,11 +69,7 @@ publishing { } } - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. +repositories { + } } diff --git a/gradle.properties b/gradle.properties index 25ea5dc..441b974 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.11 -yarn_mappings=1.21.11+build.6 -loader_version=0.19.3 +minecraft_version=26.1.2 +# Official mappings are used for 26.1.2 +loader_version=0.18.4 # Mod Properties mod_version=1.0 maven_group=de.winniepat archives_base_name=ParrotMod # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.141.4+1.21.11 \ No newline at end of file +fabric_version=0.151.0+26.1.2 \ No newline at end of file diff --git a/src/main/resources/parrotmod.mixins.json b/src/main/resources/parrotmod.mixins.json index dda32a0..5f0515e 100644 --- a/src/main/resources/parrotmod.mixins.json +++ b/src/main/resources/parrotmod.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "de.winniepat.parrotmod.mixin", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "mixins": [ ], "injectors": {