diff --git a/build.gradle b/build.gradle index dd0c7c9c..20d34c2a 100644 --- a/build.gradle +++ b/build.gradle @@ -50,8 +50,9 @@ dependencies { modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}" + //needed for trinkets, otherwise BetterEnd would require users to install trinkets + modApi "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}" modCompileOnly "dev.emi:trinkets:${project.trinkets_version}" - } processResources { diff --git a/gradle.properties b/gradle.properties index 5be8a1aa..7f98de4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,3 +17,4 @@ patchouli_version=55-FABRIC-SNAPSHOT bclib_version=2.0.6 rei_version=9.0.472 trinkets_version=3.4.0 +cca_version=5.0.0-beta.1 diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java index d6976bfc..bc2e5ccb 100644 --- a/src/main/java/org/betterx/betterend/BetterEnd.java +++ b/src/main/java/org/betterx/betterend/BetterEnd.java @@ -7,7 +7,6 @@ import org.betterx.betterend.commands.CommandRegistry; import org.betterx.betterend.config.Configs; import org.betterx.betterend.effects.EndPotions; import org.betterx.betterend.integration.Integrations; -import org.betterx.betterend.integration.trinkets.Elytra; import org.betterx.betterend.recipe.*; import org.betterx.betterend.registry.*; import org.betterx.betterend.util.BonemealPlants; @@ -80,7 +79,7 @@ public class BetterEnd implements ModInitializer { } }); if (RUNS_TRINKETS) { - Elytra.register(); + org.betterx.betterend.integration.trinkets.Elytra.register(); } } diff --git a/src/main/java/org/betterx/betterend/client/BetterEndClient.java b/src/main/java/org/betterx/betterend/client/BetterEndClient.java index 1463c2eb..ee948a2c 100644 --- a/src/main/java/org/betterx/betterend/client/BetterEndClient.java +++ b/src/main/java/org/betterx/betterend/client/BetterEndClient.java @@ -5,7 +5,6 @@ import org.betterx.bclib.util.TranslationHelper; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.client.render.BetterEndSkyRenderer; import org.betterx.betterend.events.ItemTooltipCallback; -import org.betterx.betterend.integration.trinkets.ElytraClient; import org.betterx.betterend.interfaces.MultiModelItem; import org.betterx.betterend.item.CrystaliteArmor; import org.betterx.betterend.registry.*; @@ -59,7 +58,7 @@ public class BetterEndClient implements ClientModInitializer { } if (BetterEnd.RUNS_TRINKETS) { - ElytraClient.register(); + org.betterx.betterend.integration.trinkets.ElytraClient.register(); } }