Skip to content

Commit f5b0c01

Browse files
committed
Migrate to MDG.
- Quack is now jar-in-jared. - AccessTransformer is now published.
1 parent f6de12b commit f5b0c01

2 files changed

Lines changed: 45 additions & 38 deletions

File tree

build.gradle

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import groovy.json.JsonOutput
22

33
plugins {
4-
id 'java'
4+
id 'java-library'
55
id 'maven-publish'
66
id 'signing'
7-
id 'com.github.johnrengelman.shadow' version '7.1.2'
8-
id 'net.neoforged.gradle.userdev' version '7.0.165'
7+
id 'net.neoforged.moddev' version '2.0.77'
98
}
109

1110
java {
@@ -28,20 +27,33 @@ version = "${mc_version}-${mod_version}"
2827
println "Starting build of ${archivesBaseName}, Version: ${mod_version}"
2928
println "Using Forge: ${forge_version}, for Minecraft: ${mc_version}"
3029

31-
minecraft {
32-
accessTransformers.file file("src/main/resources/META-INF/accesstransformer.cfg")
33-
}
30+
neoForge {
31+
enable {
32+
version = forge_version
33+
enabledSourceSets += sourceSets.test
34+
}
3435

35-
runs {
36-
client {
37-
workingDirectory file('run')
36+
accessTransformers {
37+
publish file("src/main/resources/META-INF/accesstransformer.cfg")
3838
}
39-
server {
40-
workingDirectory file('run')
39+
40+
runs {
41+
client {
42+
client()
43+
}
44+
server {
45+
server()
46+
}
47+
data {
48+
data()
49+
programArguments.addAll '--mod', 'codechickenlib', '--all', '--output', file("src/main/generated").absolutePath, '--existing', file("src/main/resources").absolutePath
50+
}
4151
}
42-
data {
43-
workingDirectory file('run')
44-
arguments.addAll '--mod', 'codechickenlib', '--all', '--output', file("src/main/generated").absolutePath, '--existing', file("src/main/resources").absolutePath
52+
53+
mods {
54+
codechickenlib {
55+
sourceSet sourceSets.main
56+
}
4557
}
4658
}
4759

@@ -57,28 +69,26 @@ processResources {
5769
}
5870
}
5971

60-
configurations {
61-
shadow
62-
implementation.extendsFrom shadow
63-
}
64-
6572
repositories {
6673
mavenLocal()
6774
maven { url "https://maven.covers1624.net/" }
6875
maven { url "https://maven.blamejared.com/" }
6976
}
7077

7178
dependencies {
72-
implementation "net.neoforged:neoforge:${forge_version}"
79+
jarJar(api('net.covers1624:Quack')) {
80+
version {
81+
strictly '[0.4.10,0.5)'
82+
prefer '0.4.10.105'
83+
}
84+
}
7385

74-
shadow 'net.covers1624:Quack:0.4.10.105'
86+
compileOnly("mezz.jei:jei-${mc_version}-neoforge:${jei_version}") {
87+
transitive false
88+
}
7589

7690
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
7791
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
78-
79-
implementation("mezz.jei:jei-${mc_version}-neoforge:${jei_version}") {
80-
transitive false
81-
}
8292
}
8393

8494
test {
@@ -114,23 +124,19 @@ def publishingMetadataTask = tasks.register("publishingMetadata") {
114124
}
115125
}
116126

117-
jar.enabled = false
118-
shadowJar {
119-
finalizedBy 'signShadowJar'
120-
archiveClassifier = ''
127+
jar {
128+
finalizedBy 'signJar'
121129
manifest commonManifest
122130

123-
configurations = [project.configurations.shadow]
124131
from file("LICENSE")
125132
}
126-
assemble.dependsOn shadowJar
127133

128-
tasks.register("signShadowJar") {
129-
dependsOn("shadowJar")
134+
tasks.register("signJar") {
135+
dependsOn("jar")
130136

131137
doFirst {
132138
def args = [:]
133-
args['jar'] = shadowJar.archiveFile.get().asFile
139+
args['jar'] = jar.archiveFile.get().asFile
134140
if (System.getenv("KEY_STORE")) {
135141
args['keyStore'] = System.getenv("KEY_STORE")
136142
file(System.getenv("KEY_STORE_PROPS")).withReader {
@@ -169,14 +175,15 @@ publishing {
169175
}
170176
}
171177
}
178+
172179
publications {
173180
CodeChickenLib(MavenPublication) {
174181
groupId project.group
175182
artifactId project.base.archivesName.get()
176183
version project.version
177-
artifact shadowJar
178-
artifact sourcesJar
179-
artifact javadocJar
184+
185+
from components['java']
186+
180187
artifact(publishingMetadata) {
181188
builtBy publishingMetadataTask
182189
classifier 'publishing'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ org.gradle.daemon=false
22

33
mc_version=1.21.1
44
forge_version=21.1.72
5-
mod_version=4.6.0
5+
mod_version=4.6.1
66
jei_version=19.21.0.246

0 commit comments

Comments
 (0)