Skip to content

Commit 6283350

Browse files
committed
Update to 1.17-pre1 (should also work on 1.17 Release)
1 parent f19289a commit 6283350

File tree

24 files changed

+534
-457
lines changed

24 files changed

+534
-457
lines changed

.gitignore

100644100755
File mode changed.

LICENSE

100644100755
File mode changed.

README.md

100644100755
File mode changed.

build.gradle

100644100755
Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
2-
id 'fabric-loom' version '0.5-SNAPSHOT'
2+
id 'fabric-loom' version '0.8-SNAPSHOT'
33
id 'maven-publish'
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_1_8
7-
targetCompatibility = JavaVersion.VERSION_1_8
6+
sourceCompatibility = JavaVersion.VERSION_16
7+
targetCompatibility = JavaVersion.VERSION_16
88

99
archivesBaseName = project.archives_base_name
1010
version = project.mod_version
@@ -14,52 +14,51 @@ minecraft {
1414
}
1515

1616
repositories {
17+
maven { url "https://maven.terraformersmc.com/releases" }
1718
maven { url "https://jitpack.io" }
1819
}
1920

2021
dependencies {
2122
//to change the versions see the gradle.properties file
2223
minecraft "com.mojang:minecraft:${project.minecraft_version}"
2324
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
24-
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
25+
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
2526

26-
modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
27+
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
2728

28-
modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}"){
29-
exclude module: "fabric-api"
30-
}
29+
modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
3130
}
3231

3332
processResources {
3433
inputs.property "version", project.version
3534

36-
from(sourceSets.main.resources.srcDirs) {
37-
include "fabric.mod.json"
35+
filesMatching("fabric.mod.json") {
3836
expand "version": project.version
3937
}
40-
41-
from(sourceSets.main.resources.srcDirs) {
42-
exclude "fabric.mod.json"
43-
}
4438
}
4539

46-
// ensure that the encoding is set to UTF-8, no matter what the system default is
47-
// this fixes some edge cases with special characters not displaying correctly
48-
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
49-
tasks.withType(JavaCompile) {
50-
options.encoding = "UTF-8"
40+
tasks.withType(JavaCompile).configureEach {
41+
// ensure that the encoding is set to UTF-8, no matter what the system default is
42+
// this fixes some edge cases with special characters not displaying correctly
43+
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
44+
// If Javadoc is generated, this must be specified in that task too.
45+
it.options.encoding = "UTF-8"
46+
47+
// Minecraft 1.17 (21w19a) upwards uses Java 16.
48+
it.options.release = 16
5149
}
5250

53-
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
54-
// if it is present.
55-
// If you remove this task, sources will not be generated.
56-
task sourcesJar(type: Jar, dependsOn: classes) {
57-
classifier = "sources"
58-
from sourceSets.main.allSource
51+
java {
52+
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
53+
// if it is present.
54+
// If you remove this line, sources will not be generated.
55+
withSourcesJar()
5956
}
6057

6158
jar {
62-
from "LICENSE"
59+
from("LICENSE") {
60+
rename { "${it}_${project.archivesBaseName}"}
61+
}
6362
}
6463

6564
// configure the maven publication
@@ -76,9 +75,11 @@ publishing {
7675
}
7776
}
7877

79-
// select the repositories you want to publish to
78+
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
8079
repositories {
81-
// uncomment to publish to the local maven
82-
// mavenLocal()
80+
// Add repositories to publish to here.
81+
// Notice: This block does NOT have the same function as the block in the top level.
82+
// The repositories here will be used for publishing your artifact, not for
83+
// retrieving dependencies.
8384
}
8485
}

gradle.properties

100644100755
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/use
6-
minecraft_version=1.16.5
7-
yarn_mappings=1.16.5+build.5
8-
loader_version=0.11.2
6+
minecraft_version=1.17-rc1
7+
yarn_mappings=1.17-rc1+build.5
8+
loader_version=0.11.3
99

1010
# Mod Properties
11-
mod_version = 2.1.0
11+
mod_version = 2.2.0
1212
maven_group = eu.midnightdust
1313
archives_base_name = cullleaves
1414

1515
# Dependencies
1616
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
17-
fabric_version=0.31.0+1.16
18-
19-
mod_menu_version = 1.14.6+build.31
17+
fabric_version=0.34.8+1.17
18+
mod_menu_version = 2.0.0-beta.7

gradle/wrapper/gradle-wrapper.jar

100644100755
3.5 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

100644100755
Lines changed: 16 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

100644100755
Lines changed: 7 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

100644100755
File mode changed.

0 commit comments

Comments
 (0)