From 2bab8f7744fd311738db3c11ea48891eeb0dc606 Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Sat, 8 Jul 2023 09:19:59 +0300 Subject: [PATCH] Define fabric refmap json file This prevents conflicts with other plugins that use mixins and define default refmap file. Affects issues: - Fixed #3106 --- Plan/fabric/build.gradle | 5 +++++ Plan/fabric/src/main/resources/plan.mixins.json | 1 + 2 files changed, 6 insertions(+) diff --git a/Plan/fabric/build.gradle b/Plan/fabric/build.gradle index 2f3e7cb2e..edada315c 100644 --- a/Plan/fabric/build.gradle +++ b/Plan/fabric/build.gradle @@ -30,6 +30,11 @@ dependencies { testImplementation project(path: ":common", configuration: 'testArtifacts') } +loom { + // Defining separate refmap file prevents conflicts with plugin mixins + mixin.defaultRefmapName.set("plan-fabric-refmap.json") +} + tasks.withType(JavaCompile).configureEach { options.release.set(17) } diff --git a/Plan/fabric/src/main/resources/plan.mixins.json b/Plan/fabric/src/main/resources/plan.mixins.json index 943fbcb48..30e2a029e 100644 --- a/Plan/fabric/src/main/resources/plan.mixins.json +++ b/Plan/fabric/src/main/resources/plan.mixins.json @@ -3,6 +3,7 @@ "minVersion": "0.8", "package": "net.playeranalytics.plan.gathering.listeners.events.mixin", "compatibilityLevel": "JAVA_17", + "refmap": "plan-fabric-refmap.json", "mixins": [ "ClientToServerHandshakePacketMixin", "KickCommandMixin",