Skip to content

Commit f9b76e4

Browse files
committed
Port to MC 1.20
1 parent abf95d9 commit f9b76e4

File tree

141 files changed

+295
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+295
-186
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pipeline {
3131
]) {
3232

3333
echo 'Building project.'
34-
sh './gradlew build publish publishCurseForge updateVersionTracker postDiscord --stacktrace --warn'
34+
sh './gradlew build publish publishCurseForge modrinth updateVersionTracker postDiscord --stacktrace --warn'
3535
}
3636
}
3737
}

build.gradle

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ buildscript {
1212
}
1313
}
1414

15+
plugins {
16+
id 'fabric-loom' version '1.2-SNAPSHOT' apply(false)
17+
id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false)
18+
id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false)
19+
id 'org.spongepowered.mixin' version '0.7-SNAPSHOT' apply(false)
20+
id 'net.darkhax.curseforgegradle' version '1.1.15' apply(false)
21+
id 'com.modrinth.minotaur' version '2.8.0' apply(false)
22+
}
23+
1524
apply from: 'gradle/property_loader.gradle'
1625
apply from: 'gradle/build_number.gradle'
1726
apply from: 'gradle/git_changelog.gradle'
@@ -87,14 +96,14 @@ task postDiscord() {
8796
def embed = new Embed();
8897
def downloadSources = new StringJoiner('\n')
8998

90-
if (project(':Forge').hasProperty('curse_file_url')) {
99+
if (project(':forge').hasProperty('curse_file_url')) {
91100

92-
downloadSources.add("<:forge:916233930091401266> [Forge](${project(':Forge').findProperty('curse_file_url')})")
101+
downloadSources.add("<:forge:916233930091401266> [Forge](${project(':forge').findProperty('curse_file_url')})")
93102
}
94103

95-
if (project(':Fabric').hasProperty('curse_file_url')) {
104+
if (project(':fabric').hasProperty('curse_file_url')) {
96105

97-
downloadSources.add("<:fabric:916233929722314763> [Fabric](${project(':Fabric').findProperty('curse_file_url')})")
106+
downloadSources.add("<:fabric:916233929722314763> [Fabric](${project(':fabric').findProperty('curse_file_url')})")
98107
}
99108

100109
// Add Curseforge DL link if available.

Common/build.gradle renamed to common/build.gradle

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
plugins {
2-
id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
2+
id 'org.spongepowered.gradle.vanilla'
33
}
4-
54
apply from: '../gradle/property_helper.gradle'
65

7-
archivesBaseName = "${mod_name}-Common-${minecraft_version}"
6+
base {
7+
archivesName = "${mod_name}-Common-${minecraft_version}"
8+
}
89

910
minecraft {
1011
version(minecraft_version)
@@ -33,20 +34,8 @@ project.publishing {
3334

3435
mavenJava(MavenPublication) {
3536

36-
artifactId project.archivesBaseName
37-
38-
// Base mod archive.
39-
artifact jar
40-
41-
// Adds the sources as an artifact.
42-
artifact project.sourcesJar {
43-
classifier 'sources'
44-
}
45-
46-
// Adds the javadocs as an artifact.
47-
artifact project.javadocJar {
48-
classifier 'javadoc'
49-
}
37+
artifactId = base.archivesName.get()
38+
from components.java
5039
}
5140
}
5241

0 commit comments

Comments
 (0)