From f48ed1212b049e3fedb4f09991163d48b68ade80 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 21 May 2023 20:17:38 -0400 Subject: [PATCH] Move AE2 dynamic resources compat to common module --- common/build.gradle | 3 +++ .../mixin/perf/dynamic_resources/ae2/RegistrationMixin.java | 2 +- forge/build.gradle | 1 - gradle.properties | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) rename {forge/src/main/java/org/embeddedt/modernfix/forge => common/src/main/java/org/embeddedt/modernfix/common}/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java (96%) diff --git a/common/build.gradle b/common/build.gradle index f047ba1d..ce3ad020 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -23,6 +23,9 @@ dependencies { modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}") { transitive = false } + modCompileOnly("appeng:appliedenergistics2-fabric:${appeng_version}") { + transitive = false + } // compile against the JEI API but do not include it at runtime modCompileOnly("mezz.jei:jei-${minecraft_version}-common:${jei_version}") // Remove the next line if you don't want to depend on the API diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java index 45b1c686..d6bc85b6 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.ae2; +package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.ae2; import appeng.core.AppEng; import appeng.init.client.InitAutoRotatingModel; diff --git a/forge/build.gradle b/forge/build.gradle index 287be48b..93defe66 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -45,7 +45,6 @@ dependencies { modCompileOnly("team.chisel.ctm:CTM:${ctm_version}") modCompileOnly("curse.maven:supermartijncore-454372:4455384") - modCompileOnly("appeng:appliedenergistics2-forge:11.7.3") modCompileOnly("vazkii.patchouli:Patchouli:1.18.2-71.1") common(project(path: ":common", configuration: "namedElements")) { transitive false } diff --git a/gradle.properties b/gradle.properties index 95bd8e12..44cfec12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,3 +18,4 @@ fabric_loader_version=0.14.18 fabric_api_version=0.76.0+1.18.2 modmenu_version=3.2.5 +appeng_version=11.7.2 \ No newline at end of file