From fe1b77de29ee87d7f580863b601a375b62f0416a Mon Sep 17 00:00:00 2001 From: StewStrong Date: Fri, 27 Sep 2024 01:53:50 -0700 Subject: [PATCH] Made EMF and ETF compileOnly so that servers can run --- .../mod/mixin/ValkyrienCommonMixinConfigPlugin.java | 6 ++++++ fabric/build.gradle | 4 ++-- forge/build.gradle | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/org/valkyrienskies/mod/mixin/ValkyrienCommonMixinConfigPlugin.java b/common/src/main/java/org/valkyrienskies/mod/mixin/ValkyrienCommonMixinConfigPlugin.java index 8baef82ba..5e7d3d55a 100644 --- a/common/src/main/java/org/valkyrienskies/mod/mixin/ValkyrienCommonMixinConfigPlugin.java +++ b/common/src/main/java/org/valkyrienskies/mod/mixin/ValkyrienCommonMixinConfigPlugin.java @@ -83,6 +83,12 @@ public boolean shouldApplyMixin(final String s, final String mixinClassName) { return false; } } + // Only load this mixin when ETF is installed + if (mixinClassName.equals("org.valkyrienskies.mod.mixin.mod_compat.etf.MixinBlockEntity")) { + if (!classExists("traben.entity_texture_features.utils.ETFEntity")) { + return false; + } + } return true; } diff --git a/fabric/build.gradle b/fabric/build.gradle index e009120ce..da7bdc668 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -77,8 +77,8 @@ dependencies { modCompileOnly("maven.modrinth:cc-tweaked:${cc_tweaked_version}") // EMF compat - modImplementation("curse.maven:entity-model-features-844662:5696901") - modImplementation("curse.maven:entity-texture-features-fabric-568563:5697084") + modCompileOnly("curse.maven:entity-model-features-844662:5696901") + modCompileOnly("curse.maven:entity-texture-features-fabric-568563:5697084") // Create compat modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}") { diff --git a/forge/build.gradle b/forge/build.gradle index e07ddb2c9..91998b061 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -80,8 +80,8 @@ dependencies { modCompileOnly("maven.modrinth:cc-tweaked:${cc_tweaked_version}") // EMF compat - modImplementation("curse.maven:entity-model-features-844662:5696899") - modImplementation("curse.maven:entity-texture-features-fabric-568563:5697083") + modCompileOnly("curse.maven:entity-model-features-844662:5696899") + modCompileOnly("curse.maven:entity-texture-features-fabric-568563:5697083") modCompileOnly("maven.modrinth:create-utilities:0.2.0+1.20.1") modImplementation("teamreborn:energy:${energy_version}") {