GregTechCEu · screret · Aug 21, 2024 · Aug 21, 2024 · Aug 21, 2024 · Aug 22, 2024
@@ -38,3 +38,8 @@ runs:
  notifications
  jdks
  wrapper
+
+ # run gradlew jar to set up necessary files before shadow can break them in the Build step
+ - name: Pre-build
+ shell: bash
+ run: ./gradlew jar --build-cache
@@ -1,11 +1,13 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
  id 'java-library'
  id 'eclipse'
  id 'idea'
  id 'maven-publish'
  alias libs.plugins.modDevGradle
  alias libs.plugins.machete // automatic jar compressing on build
- //alias libs.plugins.shadow
+ alias libs.plugins.shadow
  alias libs.plugins.spotless
  alias libs.plugins.lombok
 }
@@ -18,14 +20,31 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 boolean isSnapshot = System.getenv("SNAPSHOT")
 version = "${mod_version}" + (isSnapshot ? "-SNAPSHOT" : "")
 
+tasks.register('slimJar', ShadowJar) {
+ from sourceSets.main.output
+}
+
+final refmapFile = mixin.add sourceSets.main, "gtceu.refmap.json"
+
 apply from: "$rootDir/gradle/scripts/moddevgradle.gradle"
 apply from: "$rootDir/gradle/scripts/repositories.gradle"
+apply from: "$rootDir/gradle/scripts/jars.gradle"
 apply from: "$rootDir/dependencies.gradle"
 apply from: "$rootDir/gradle/scripts/resources.gradle"
-apply from: "$rootDir/gradle/scripts/jars.gradle"
 apply from: "$rootDir/gradle/scripts/publishing.gradle"
 apply from: "$rootDir/gradle/scripts/spotless.gradle"
 
+afterEvaluate {
+ tasks.withType(ShadowJar).configureEach {
+ from(refmapFile)
+ configurations = [project.configurations.includedLibrary]
+ minimize()
+ relocate("org.jgrapht", "${maven_group}.repack.org.jgrapht")
+ relocate("org.jheaps", "${maven_group}.repack.org.jheaps")
+ relocate("org.apfloat", "${maven_group}.repack.org.apfloat")
+ }
+}
+
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 

@@ -1,6 +1,12 @@
 dependencies {
  compileOnly 'org.jetbrains:annotations:24.1.0'
 
+ // Shadowed Dependencies
+ // Packages that aren't mods, and thus need to be included in the release files.
+
+ api(includedLibrary('org.jgrapht:jgrapht-core:1.5.2')) // JGraphT 1.5.2
+ additionalRuntimeClasspath('org.jgrapht:jgrapht-core:1.5.2')
+
  // LDLib
  modApi(forge.ldlib.forge) { transitive = false }
  jarJar(forge.ldlib.forge)
@@ -57,7 +63,7 @@ dependencies {
  jarJar(forge.configuration)
 
  // Shimmer
- modCompileOnly(forge.shimmer.forge) { transitive = false }
+ modImplementation(forge.shimmer.forge) { transitive = false }
  modCompileOnly("maven.modrinth:embeddium:0.3.19+mc1.20.1")
  modCompileOnly("maven.modrinth:oculus:1.20.1-1.7.0")
 

@@ -1,12 +1,46 @@
-tasks.register('slimJar', Jar) {
+configurations {
+ includedLibrary {
+ canBeConsumed = false
+ canBeResolved = true
+ }
+}
+
+// hack to avoid a bug in Shadow: https://github.com/GradleUp/shadow/issues/111
+tasks.register('shadowBugWorkaround', Jar) {
+ dependsOn jarJar
+ from jarJar.outputs
+}
+
+shadowJar {
+ from tasks.shadowBugWorkaround
+ configurations = [project.configurations.includedLibrary]
+ archiveClassifier = "dev"
+}
+
+slimJar {
+ configurations = [project.configurations.includedLibrary]
  archiveClassifier = "dev-slim"
- from sourceSets.main.output
 }
 
 obfuscation {
  reobfuscate(tasks.named('slimJar'), sourceSets.main) {
  archiveClassifier = "slim"
  }
+ reobfuscate(tasks.named('shadowJar'), sourceSets.main) {
+ archiveClassifier = null
+ archiveClassifier.convention(null)
+ }
+}
+
+jar {
+ archiveClassifier = "dev-no-shadow"
+ archiveClassifier.convention("dev-no-shadow")
+ enabled = false
+}
+
+reobfJar {
+ archiveClassifier = "no-shadow"
+ enabled = false
 }
 
 tasks.register('sourcesJar', Jar) {
@@ -21,6 +55,8 @@ base {
 
 afterEvaluate {
  tasks.withType(org.gradle.jvm.tasks.Jar).configureEach {
+ exclude ".cache/*"
+
  manifest.attributes([
  'MixinConfigs': 'gtceu.mixins.json',
  'Specification-Title': project.name,

@@ -1,6 +1,4 @@
-
 mixin {
- add sourceSets.main, "gtceu.refmap.json"
  config 'gtceu.mixins.json'
 }
 

@@ -1,5 +1,6 @@
 artifacts {
- archives tasks.reobfJar
+ archives tasks.shadowJar
+ archives tasks.reobfShadowJar
  archives tasks.reobfSlimJar
  archives tasks.sourcesJar
 }
@@ -8,7 +9,7 @@ publishing {
  publications {
  mavenJava(MavenPublication) {
  groupId = project.maven_group
- artifactId = project.archivesBaseName
+ artifactId = base.archivesName
  version = project.version
 
  from components.java

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -52,7 +52,7 @@ dependencyResolutionManagement {
  // Libs
  def quiltMappingsVersion = "5" // https://lambdaurora.dev/tools/import_quilt.html
  def parchmentVersion = "2023.09.03" // https://parchmentmc.org/docs/getting-started
- def shadowVersion = "7.1.2"
+ def shadowVersion = "8.3.0"
  def spotlessVersion = "6.25.0"
  def modDevGradleVersion = "2.0.61-beta-pr-118-legacy"
  def vineFlowerVersion = "1.+"
@@ -151,7 +151,7 @@ dependencyResolutionManagement {
  library("minecraft", "com.mojang", "minecraft").versionRef(minecraft)
 
  def shadow = version("shadow", shadowVersion)
- plugin("shadow", "com.github.johnrengelman.shadow").versionRef(shadow)
+ plugin("shadow", "com.gradleup.shadow").versionRef(shadow)
 
  def spotless = version("spotless", spotlessVersion)
  plugin("spotless", "com.diffplug.spotless").versionRef(spotless)

@@ -1,7 +1,7 @@
 {
  "variants": {
  "": {
- "model": "gtceu:block/oil_heavy"
+ "model": "gtceu:block/heavy_oil"
  }
  }
 }
@@ -1,7 +1,7 @@
 {
  "variants": {
  "": {
- "model": "gtceu:block/oil_light"
+ "model": "gtceu:block/light_oil"
  }
  }
 }
@@ -0,0 +1,7 @@
+{
+ "variants": {
+ "": {
+ "model": "gtceu:block/raw_oil"
+ }
+ }
+}
@@ -17,7 +17,7 @@
  "gtceu:andesite_nickel_ore",
  "gtceu:andesite_palladium_ore",
  "gtceu:andesite_platinum_ore",
- "gtceu:andesite_plutonium_ore",
+ "gtceu:andesite_plutonium_239_ore",
  "gtceu:andesite_silver_ore",
  "gtceu:andesite_sulfur_ore",
  "gtceu:andesite_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:basalt_nickel_ore",
  "gtceu:basalt_palladium_ore",
  "gtceu:basalt_platinum_ore",
- "gtceu:basalt_plutonium_ore",
+ "gtceu:basalt_plutonium_239_ore",
  "gtceu:basalt_silver_ore",
  "gtceu:basalt_sulfur_ore",
  "gtceu:basalt_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:blackstone_nickel_ore",
  "gtceu:blackstone_palladium_ore",
  "gtceu:blackstone_platinum_ore",
- "gtceu:blackstone_plutonium_ore",
+ "gtceu:blackstone_plutonium_239_ore",
  "gtceu:blackstone_silver_ore",
  "gtceu:blackstone_sulfur_ore",
  "gtceu:blackstone_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:deepslate_nickel_ore",
  "gtceu:deepslate_palladium_ore",
  "gtceu:deepslate_platinum_ore",
- "gtceu:deepslate_plutonium_ore",
+ "gtceu:deepslate_plutonium_239_ore",
  "gtceu:deepslate_silver_ore",
  "gtceu:deepslate_sulfur_ore",
  "gtceu:deepslate_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:diorite_nickel_ore",
  "gtceu:diorite_palladium_ore",
  "gtceu:diorite_platinum_ore",
- "gtceu:diorite_plutonium_ore",
+ "gtceu:diorite_plutonium_239_ore",
  "gtceu:diorite_silver_ore",
  "gtceu:diorite_sulfur_ore",
  "gtceu:diorite_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:endstone_nickel_ore",
  "gtceu:endstone_palladium_ore",
  "gtceu:endstone_platinum_ore",
- "gtceu:endstone_plutonium_ore",
+ "gtceu:endstone_plutonium_239_ore",
  "gtceu:endstone_silver_ore",
  "gtceu:endstone_sulfur_ore",
  "gtceu:endstone_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:granite_nickel_ore",
  "gtceu:granite_palladium_ore",
  "gtceu:granite_platinum_ore",
- "gtceu:granite_plutonium_ore",
+ "gtceu:granite_plutonium_239_ore",
  "gtceu:granite_silver_ore",
  "gtceu:granite_sulfur_ore",
  "gtceu:granite_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:gravel_nickel_ore",
  "gtceu:gravel_palladium_ore",
  "gtceu:gravel_platinum_ore",
- "gtceu:gravel_plutonium_ore",
+ "gtceu:gravel_plutonium_239_ore",
  "gtceu:gravel_silver_ore",
  "gtceu:gravel_sulfur_ore",
  "gtceu:gravel_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:marble_nickel_ore",
  "gtceu:marble_palladium_ore",
  "gtceu:marble_platinum_ore",
- "gtceu:marble_plutonium_ore",
+ "gtceu:marble_plutonium_239_ore",
  "gtceu:marble_silver_ore",
  "gtceu:marble_sulfur_ore",
  "gtceu:marble_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:netherrack_nickel_ore",
  "gtceu:netherrack_palladium_ore",
  "gtceu:netherrack_platinum_ore",
- "gtceu:netherrack_plutonium_ore",
+ "gtceu:netherrack_plutonium_239_ore",
  "gtceu:netherrack_silver_ore",
  "gtceu:netherrack_sulfur_ore",
  "gtceu:netherrack_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:red_granite_nickel_ore",
  "gtceu:red_granite_palladium_ore",
  "gtceu:red_granite_platinum_ore",
- "gtceu:red_granite_plutonium_ore",
+ "gtceu:red_granite_plutonium_239_ore",
  "gtceu:red_granite_silver_ore",
  "gtceu:red_granite_sulfur_ore",
  "gtceu:red_granite_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:red_sand_nickel_ore",
  "gtceu:red_sand_palladium_ore",
  "gtceu:red_sand_platinum_ore",
- "gtceu:red_sand_plutonium_ore",
+ "gtceu:red_sand_plutonium_239_ore",
  "gtceu:red_sand_silver_ore",
  "gtceu:red_sand_sulfur_ore",
  "gtceu:red_sand_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:sand_nickel_ore",
  "gtceu:sand_palladium_ore",
  "gtceu:sand_platinum_ore",
- "gtceu:sand_plutonium_ore",
+ "gtceu:sand_plutonium_239_ore",
  "gtceu:sand_silver_ore",
  "gtceu:sand_sulfur_ore",
  "gtceu:sand_thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:nickel_ore",
  "gtceu:palladium_ore",
  "gtceu:platinum_ore",
- "gtceu:plutonium_ore",
+ "gtceu:plutonium_239_ore",
  "gtceu:silver_ore",
  "gtceu:sulfur_ore",
  "gtceu:thorium_ore",

@@ -17,7 +17,7 @@
  "gtceu:tuff_nickel_ore",
  "gtceu:tuff_palladium_ore",
  "gtceu:tuff_platinum_ore",
- "gtceu:tuff_plutonium_ore",
+ "gtceu:tuff_plutonium_239_ore",
  "gtceu:tuff_silver_ore",
  "gtceu:tuff_sulfur_ore",
  "gtceu:tuff_thorium_ore",

@@ -5,7 +5,7 @@
  },
  "page": "gtceu:materials/chainsaw_head",
  "position": [
- -250,
+ -300,
  250
  ],
  "section": "gtceu:materials"

@@ -4,8 +4,8 @@
  "res": "gtceu:aluminium_frame"
  },
  "items": [
- "#minecraft:climbable",
- "#forge:frames"
+ "#forge:frames",
+ "#minecraft:climbable"
  ],
  "page": "gtceu:materials/frame",
  "position": [

@@ -5,7 +5,7 @@
  },
  "page": "gtceu:materials/screwdriver_tip",
  "position": [
- -100,
+ -150,
  100
  ],
  "section": "gtceu:materials"

@@ -5,7 +5,7 @@
  },
  "page": "gtceu:materials/wire_cutter_head",
  "position": [
- -300,
+ -350,
  200
  ],
  "section": "gtceu:materials"