Fix including Datagen class in NeoForge final Jar, remove jdot indev tweak

JT122406 · JT122406 · commit 19e40ff63ede · 2025-08-10T22:45:13.000-04:00
diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts
@@ -28,9 +28,6 @@ configurations {
         isCanBeResolved = true
         isCanBeConsumed = false
     }
-    configureEach {
-        resolutionStrategy.force("net.sf.jopt-simple:jopt-simple:5.0.4")
-    }
 }
 
 loom {
@@ -50,7 +47,6 @@ dependencies {
     "shadowBundle"(project(":Common", "transformProductionForge")) { isTransitive = false }
 
     implementation("blue.endless:jankson:${project.properties["jankson_version"]}")?.let { "shadowBundle"(it) }
-    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
 }
 
 tasks {
diff --git a/NeoForge/build.gradle.kts b/NeoForge/build.gradle.kts
@@ -60,7 +60,7 @@ tasks {
     }
 
     shadowJar {
-        exclude("architectury.common.json", "dev/corgi/corgilib/neoforge/datagen/**")
+        exclude("architectury.common.json", "dev/corgitaco/corgilib/neoforge/datagen/**")
         configurations = listOf(project.configurations.getByName("shadowBundle"))
         archiveClassifier.set("dev-shadow")
         relocate("blue.endless.jankson", "corgitaco.corgilib.shadow.blue.endless.jankson")

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,6 @@ configurations {`
`28`	`28`	`isCanBeResolved = true`
`29`	`29`	`isCanBeConsumed = false`
`30`	`30`	`}`
`31`		`- configureEach {`
`32`		`- resolutionStrategy.force("net.sf.jopt-simple:jopt-simple:5.0.4")`
`33`		`- }`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`loom {`
`@@ -50,7 +47,6 @@ dependencies {`
`50`	`47`	`"shadowBundle"(project(":Common", "transformProductionForge")) { isTransitive = false }`
`51`	`48`
`52`	`49`	`implementation("blue.endless:jankson:${project.properties["jankson_version"]}")?.let { "shadowBundle"(it) }`
`53`		`- // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+`
`54`	`50`	`}`
`55`	`51`
`56`	`52`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ tasks {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`shadowJar {`
`63`		`- exclude("architectury.common.json", "dev/corgi/corgilib/neoforge/datagen/**")`
	`63`	`+ exclude("architectury.common.json", "dev/corgitaco/corgilib/neoforge/datagen/**")`
`64`	`64`	`configurations = listOf(project.configurations.getByName("shadowBundle"))`
`65`	`65`	`archiveClassifier.set("dev-shadow")`
`66`	`66`	`relocate("blue.endless.jankson", "corgitaco.corgilib.shadow.blue.endless.jankson")`