@@ -33,19 +33,13 @@ plugins {
33
33
// Common
34
34
//
35
35
id ' maven-publish'
36
-
37
- // For Gradle 7+
38
- // id 'com.github.johnrengelman.shadow' version '7.1.2'
39
- // For Gradle 8+
40
- // id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
41
36
}
42
37
43
38
// Select the Gradle plugin based on the loader.
44
39
switch (System . getProperty(' pickhaxe.loader.current' )) {
45
40
case ' forge' :
46
41
apply plugin : ' net.minecraftforge.gradle'
47
42
apply plugin : ' org.parchmentmc.librarian.forgegradle'
48
- apply plugin : ' com.github.johnrengelman.shadow'
49
43
break
50
44
case ' fabric' :
51
45
apply plugin : ' fabric-loom'
@@ -262,23 +256,6 @@ tasks.jar {
262
256
}
263
257
}
264
258
265
- shadowJar {
266
- archiveClassifier = ' '
267
- configurations = [project. configurations. shade]
268
-
269
- // Shadow the listed packages.
270
- relocate (' net.pickhaxe' , " ${ project.group} .shadow.net.pickhaxe" ) {
271
- exclude " ${ project.group} "
272
- }
273
- relocate (' haxe' , " ${ project.group} .shadow.haxe" ) {
274
- exclude " ${ project.group} "
275
- }
276
-
277
- if (System . getProperty(' pickhaxe.loader.current' ). equals(' forge' )) {
278
- finalizedBy ' reobfShadowJar'
279
- }
280
- }
281
-
282
259
if (System . getProperty(' pickhaxe.loader.current' ). equals(' fabric' ) && System . getProperty(' pickhaxe.haxe.jvm' ). equals(' true' )) {
283
260
remapJar {
284
261
input = file(" ../build/fabric/${ System.getProperty('pickhaxe.minecraft.version')} /${ System.getProperty('pickhaxe.mod.id')} -${ System.getProperty('pickhaxe.mod.version')} -dev.jar" )
@@ -290,28 +267,10 @@ if (System.getProperty('pickhaxe.loader.current').equals('fabric') && System.get
290
267
from zipTree(" ../build/forge/${ System.getProperty('pickhaxe.minecraft.version')} /${ System.getProperty('pickhaxe.mod.id')} -${ System.getProperty('pickhaxe.mod.version')} -dev.jar" )
291
268
}
292
269
293
- task shadowSourcesJar(type : com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar ) {
294
- dependsOn sourcesJar
295
-
296
- archiveClassifier = ' shadow'
297
- configurations = [project. configurations. shade]
298
-
299
- // Shadow the listed packages.
300
- relocate (' net.pickhaxe' , " ${ project.group} .shadow.net.pickhaxe" ) {
301
- exclude " ${ project.group} "
302
- }
303
- relocate (' haxe' , " ${ project.group} .shadow.haxe" ) {
304
- exclude " ${ project.group} "
305
- }
306
- }
307
-
308
270
reobf {
309
271
sourcesJar {
310
272
finalizedBy(' copyReobfSourcesJar' )
311
- }
312
- shadowSourcesJar {
313
- finalizedBy(' copyReobfShadowSourcesJar' )
314
- }
273
+ }
315
274
}
316
275
317
276
task copyReobfSourcesJar(type : Copy ) {
@@ -321,14 +280,6 @@ if (System.getProperty('pickhaxe.loader.current').equals('fabric') && System.get
321
280
exclude ' **/*.txt'
322
281
into " ../build/forge/${ System.getProperty('pickhaxe.minecraft.version')} /"
323
282
}
324
-
325
- task copyReobfShadowSourcesJar(type : Copy ) {
326
- from(" $buildDir /reobfShadowSourcesJar" ) {
327
- rename " output.jar" , " ${ System.getProperty('pickhaxe.mod.id')} -${ System.getProperty('pickhaxe.mod.version')} .jar"
328
- }
329
- exclude ' **/*.txt'
330
- into " ../build/forge/${ System.getProperty('pickhaxe.minecraft.version')} /"
331
- }
332
283
}
333
284
334
285
if (System . getProperty(' pickhaxe.loader.current' ). equals(' fabric' )) {
@@ -339,12 +290,6 @@ if (System.getProperty('pickhaxe.loader.current').equals('fabric')) {
339
290
340
291
341
292
if (System . getProperty(' pickhaxe.loader.current' ). equals(' forge' )) {
342
- assemble. dependsOn shadowJar
343
-
344
- reobf {
345
- shadowJar {}
346
- }
347
-
348
293
jar. finalizedBy(' reobfJar' )
349
294
350
295
// Disable additional resource processing for the runClient task.
0 commit comments