From 206afb8629d5711310fc66b8ed8014f84bbd6e79 Mon Sep 17 00:00:00 2001 From: nea Date: Sun, 30 Jul 2023 14:57:10 +0200 Subject: Fix remapping of buildscript --- build.gradle.kts | 6 +++--- src/main/resources/firmament.mixins.json | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4ba4406..bfcb369 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -165,16 +165,16 @@ tasks.jar { tasks.shadowJar { configurations = listOf(shadowMe) - archiveClassifier.set("") + archiveClassifier.set("dev") relocate("io.github.moulberry.repo", "moe.nea.firmament.deps.repo") + destinationDirectory.set(layout.buildDirectory.dir("badjars")) } tasks.remapJar { - destinationDirectory.set(layout.buildDirectory.dir("badjars")) injectAccessWidener.set(true) inputFile.set(tasks.shadowJar.flatMap { it.archiveFile }) dependsOn(tasks.shadowJar) - archiveClassifier.set("dev") + archiveClassifier.set("") } tasks.processResources { diff --git a/src/main/resources/firmament.mixins.json b/src/main/resources/firmament.mixins.json index 599c8ea..cdf66e0 100644 --- a/src/main/resources/firmament.mixins.json +++ b/src/main/resources/firmament.mixins.json @@ -1,9 +1,10 @@ { - "required": true, - "plugin": "moe.nea.firmament.init.MixinPlugin", - "package": "moe.nea.firmament.mixins", - "compatibilityLevel": "JAVA_17", - "injectors": { - "defaultRequire": 1 - } + "required": true, + "plugin": "moe.nea.firmament.init.MixinPlugin", + "package": "moe.nea.firmament.mixins", + "compatibilityLevel": "JAVA_17", + "injectors": { + "defaultRequire": 1 + }, + "refmap": "Firmament-refmap.json" } -- cgit