MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Fix] Crash when trinkets is not installed

Browse source
This commit is contained in:
Frank 2022-06-30 15:30:20 +02:00
parent 442e4a438a
commit 50c305adc9
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build.gradle
View file

@ -50,8 +50,9 @@ dependencies {
modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-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}" modCompileOnly "dev.emi:trinkets:${project.trinkets_version}"
} }
processResources { processResources {

1
gradle.properties
View file

@ -17,3 +17,4 @@ patchouli_version=55-FABRIC-SNAPSHOT
bclib_version=2.0.6 bclib_version=2.0.6
rei_version=9.0.472 rei_version=9.0.472
trinkets_version=3.4.0 trinkets_version=3.4.0
cca_version=5.0.0-beta.1

3
src/main/java/org/betterx/betterend/BetterEnd.java
View file

@ -7,7 +7,6 @@ import org.betterx.betterend.commands.CommandRegistry;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.effects.EndPotions; import org.betterx.betterend.effects.EndPotions;
import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.Integrations;
import org.betterx.betterend.integration.trinkets.Elytra;
import org.betterx.betterend.recipe.*; import org.betterx.betterend.recipe.*;
import org.betterx.betterend.registry.*; import org.betterx.betterend.registry.*;
import org.betterx.betterend.util.BonemealPlants; import org.betterx.betterend.util.BonemealPlants;
@ -80,7 +79,7 @@ public class BetterEnd implements ModInitializer {
} }
}); });
if (RUNS_TRINKETS) { if (RUNS_TRINKETS) {
Elytra.register(); org.betterx.betterend.integration.trinkets.Elytra.register();
} }
} }

3
src/main/java/org/betterx/betterend/client/BetterEndClient.java
View file

@ -5,7 +5,6 @@ import org.betterx.bclib.util.TranslationHelper;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.client.render.BetterEndSkyRenderer; import org.betterx.betterend.client.render.BetterEndSkyRenderer;
import org.betterx.betterend.events.ItemTooltipCallback; import org.betterx.betterend.events.ItemTooltipCallback;
import org.betterx.betterend.integration.trinkets.ElytraClient;
import org.betterx.betterend.interfaces.MultiModelItem; import org.betterx.betterend.interfaces.MultiModelItem;
import org.betterx.betterend.item.CrystaliteArmor; import org.betterx.betterend.item.CrystaliteArmor;
import org.betterx.betterend.registry.*; import org.betterx.betterend.registry.*;
@ -59,7 +58,7 @@ public class BetterEndClient implements ClientModInitializer {
} }
if (BetterEnd.RUNS_TRINKETS) { if (BetterEnd.RUNS_TRINKETS) {
ElytraClient.register(); org.betterx.betterend.integration.trinkets.ElytraClient.register();
} }
} }