diff --git a/build.gradle b/build.gradle index a250a3484..fe90e2f0e 100644 --- a/build.gradle +++ b/build.gradle @@ -42,13 +42,23 @@ repositories { } maven { url "https://maven.shedaniel.me/" + content { + includeGroup "me.shedaniel" + includeGroup "me.shedaniel.cloth" + includeGroup "dev.architectury" + } } + maven { + url = 'https://ladysnake.jfrog.io/artifactory/mods' + content { + includeGroup "io.github.onyxstudios.Cardinal-Components-API" + } + } maven { url = "https://jitpack.io" content { includeGroup "com.github.dexman545" includeGroup "com.github.emilyploszaj" - includeGroup "io.github.onyxstudios.Cardinal-Components-API" } } } @@ -72,7 +82,7 @@ license { group = 'TechReborn' allprojects { - version = "5.0.4-beta" + version = "5.0.5-beta" def build_number = ENV.BUILD_NUMBER ?: "local" version = "${version}+build.$build_number" @@ -150,7 +160,7 @@ dependencies { include project(":RebornCore") optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:6.0.264-alpha" - disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.7') + disabledOptionalDependency "com.github.emilyploszaj:trinkets:3.0.2" disabledOptionalDependency "com.github.dexman545:autoswitch-api:-SNAPSHOT" disabledOptionalDependency 'net.oskarstrom:DashLoader:2.0' diff --git a/src/main/java/techreborn/compat/trinkets/Trinkets.java b/src/main/java/techreborn/compat/trinkets/Trinkets.java index a0adc8252..d7cbf556a 100644 --- a/src/main/java/techreborn/compat/trinkets/Trinkets.java +++ b/src/main/java/techreborn/compat/trinkets/Trinkets.java @@ -24,7 +24,6 @@ package techreborn.compat.trinkets; -import dev.emi.trinkets.api.TrinketComponent; import dev.emi.trinkets.api.TrinketsApi; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Items; @@ -34,14 +33,8 @@ import java.util.function.Predicate; public class Trinkets { public static Predicate isElytraEquipped() { - return playerEntity -> { - TrinketComponent component = TrinketsApi.getTrinketComponent(playerEntity); - for (int i = 0; i < component.getInventory().size(); i++) { - if (component.getInventory().getStack(i).getItem() == Items.ELYTRA) { - return true; - } - } - return false; - }; + return playerEntity -> TrinketsApi.getTrinketComponent(playerEntity) + .map(component -> component.isEquipped(Items.ELYTRA)) + .orElse(false); } }