Skip to content

Commit 9ec25ed

Browse files
committed
Use pre-transformed Srg2Source, fixes java 17 requirement
1 parent 7ba70ac commit 9ec25ed

9 files changed

Lines changed: 16 additions & 343 deletions

File tree

build.gradle

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ plugins {
88
id 'idea'
99
id 'eclipse'
1010
id 'maven-publish'
11-
id 'local.build.jdt-transformer'
1211
id 'io.freefair.javadoc-links'
1312
id 'net.minecraftforge.gradleutils'
1413
alias libs.plugins.licenser
@@ -62,7 +61,7 @@ dependencies {
6261

6362
// moved to the beginning to be the overrider
6463
//implementation libs.asm.debug
65-
implementation libs.guava
64+
shade libs.guava
6665

6766
implementation libs.opencsv // reading CSVs.. also used by SpecialSource
6867
implementation libs.diff4j // for difing and patching
@@ -81,36 +80,20 @@ dependencies {
8180
implementation libs.httpclient
8281
implementation libs.httpmime
8382

83+
// ASM
84+
shade libs.asm.commons
85+
shade libs.asm.tree
86+
shade libs.asm
87+
8488
// mcp stuff
8589
shade libs.retroguard
8690
shade(libs.mcinjector) {
8791
exclude group: 'org.ow2.asm'
8892
}
89-
shade(libs.srg2source) {
90-
exclude group: 'cpw.mods', module: 'modlauncher'
91-
exclude group: 'org.ow2.asm'
92-
exclude group: 'org.eclipse.equinox', module: 'org.eclipse.equinox.common'
93-
94-
jdt.transform(it)
95-
}
96-
constraints {
97-
shade('org.eclipse.jdt:org.eclipse.jdt.core') {
98-
jdt.transform(it)
99-
}
93+
shade(variantOf(libs.srg2source) { classifier("fatjar") }) {
94+
transitive = false
10095
}
10196

102-
// Because Eclipse is dumb and decided to use dynamic versions with J8 incompatibility
103-
shade libs.eclipse.core.resources
104-
shade libs.eclipse.core.runtime
105-
shade libs.eclipse.text
106-
shade libs.eclipse.core.filesystem
107-
shade libs.eclipse.equinox.common
108-
shade libs.eclipse.core.contenttype
109-
shade libs.eclipse.core.jobs
110-
shade libs.eclipse.equinox.registry
111-
shade libs.eclipse.osgi
112-
shade libs.eclipse.core.commands
113-
11497
//Stuff used in the GradleStart classes
11598
compileOnly libs.authlib
11699
compileOnly(libs.launchwrapper) {
@@ -172,13 +155,17 @@ tasks.named('jar', Jar) {
172155
shadow {
173156
// Marks the jar as being embedded, not shadowed.
174157
// shadowed = relocated, embedded = no relocation.
175-
bundlingAttribute = Bundling.EMBEDDED
158+
//bundlingAttribute = Bundling.EMBEDDED
176159
}
177160

178161
tasks.named('shadowJar', ShadowJar) {
179162
archiveClassifier = null
180163
configurations = [project.configurations.shadeClasspath]
181164
exclude '.api_description', '.options', 'about.html', 'module-info.class', 'plugin.properties', 'plugin.xml', 'about_files/**'
165+
exclude 'META-INF/maven/**'
166+
enableAutoRelocation = true
167+
relocationPrefix = 'net.minecraftforge.gradle.shadow'
168+
mergeServiceFiles()
182169
}
183170

184171
license {

buildSrc/LICENSE-header.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

buildSrc/build.gradle

Lines changed: 0 additions & 37 deletions
This file was deleted.

buildSrc/settings.gradle

Lines changed: 0 additions & 35 deletions
This file was deleted.

buildSrc/src/main/java/local/build/JDTClassTransformer.java

Lines changed: 0 additions & 191 deletions
This file was deleted.

buildSrc/src/main/java/local/build/JDTTransformerExtension.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

buildSrc/src/main/java/local/build/JDTTransformerPlugin.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)