diff options
| -rw-r--r-- | build.gradle | 46 | ||||
| -rw-r--r-- | gradle.properties | 3 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java | 1 |
4 files changed, 9 insertions, 43 deletions
diff --git a/build.gradle b/build.gradle index b1c6758..6d29cb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ plugins { - id 'fabric-loom' version '0.9-SNAPSHOT' + id 'fabric-loom' version '0.10-SNAPSHOT' id 'maven-publish' } -version = project.mod_version +version = project.mod_version + "+" + project.minecraft_version group = project.maven_group repositories { @@ -46,23 +46,10 @@ loom { accessWidenerPath = file("src/main/resources/citresewn.accesswidener") } -def targetJavaVersion = 16 -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 = targetJavaVersion - } -} +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } archivesBaseName = project.archives_base_name // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // if it is present. @@ -74,27 +61,4 @@ jar { from("LICENSE") { rename { "${it}_${project.archivesBaseName}" } } -} - -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } - } - } - - // 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. - } -} +}
\ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0d3145d..814b241 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.17.1 +minecraft_version_compat=1.17.x yarn_mappings=1.17.1+build.39 -loader_version=0.11.6 +loader_version=0.12.12 fabric_api=0.39.2+1.17 modmenu=2.0.6 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc..2e6e589 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java index 9ac21c0..2300f88 100644 --- a/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java +++ b/src/main/java/shcm/shsupercm/fabric/citresewn/pack/cits/CITItem.java @@ -37,6 +37,7 @@ import java.util.*; import java.util.function.Supplier; import java.util.stream.Collectors; +@SuppressWarnings("deprecation") public class CITItem extends CIT { private static final String GENERATED_SUB_CITS_PREFIX = "sub_cititem_generated_"; public static final Set<Identifier> GENERATED_SUB_CITS_SEEN = new HashSet<>(); |