diff --git a/build.gradle b/build.gradle index 004202e7..e5ccf992 100644 --- a/build.gradle +++ b/build.gradle @@ -92,6 +92,9 @@ repositories { maven { url = "https://maven.theillusivec4.top/" } + maven { + url 'https://pkgs.dev.azure.com/quarris/Enchantability/_packaging/Release%40Local/maven/v1' + } } dependencies { @@ -102,6 +105,7 @@ dependencies { compile fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.1:6.0.0.4") compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.1-25.16") + compile fg.deobf("quarris.enchantability:enchantability:1.3.0.7") runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0-beta2") compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0-beta2:api") @@ -144,7 +148,7 @@ publishing { pom.withXml { def node = asNode() - if(node.dependencies.size() > 0) + if (node.dependencies.size() > 0) node.remove(node.dependencies) } } diff --git a/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityAuraMending.java b/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityAuraMending.java index 75bb025c..e53575fa 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityAuraMending.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityAuraMending.java @@ -1,4 +1,3 @@ -/* TODO Enchantability package de.ellpeck.naturesaura.compat.enchantibility; import de.ellpeck.naturesaura.NaturesAura; @@ -35,4 +34,3 @@ public class EnchantibilityAuraMending extends AbstractEnchantEffect { return RES; } } -*/ diff --git a/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityCompat.java b/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityCompat.java index b60cc632..953211c2 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityCompat.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/enchantibility/EnchantibilityCompat.java @@ -2,13 +2,19 @@ package de.ellpeck.naturesaura.compat.enchantibility; import de.ellpeck.naturesaura.compat.ICompat; import de.ellpeck.naturesaura.data.ItemTagProvider; +import de.ellpeck.naturesaura.enchant.ModEnchantments; +import net.minecraftforge.event.TickEvent; +import quarris.enchantability.api.EnchantabilityApi; +import quarris.enchantability.api.EnchantabilityApi.IInternals; + +import java.util.Collections; public class EnchantibilityCompat implements ICompat { @Override public void preInit() { - /*IInternals api = EnchantabilityApi.getInstance(); + IInternals api = EnchantabilityApi.getInstance(); api.registerEnchantEffect(EnchantibilityAuraMending.RES, ModEnchantments.AURA_MENDING, EnchantibilityAuraMending::new); - api.registerEffectComponent(EnchantibilityAuraMending.RES, PlayerTickEvent.class, EnchantibilityAuraMending::onPlayerTick, e -> Collections.singletonList(e.player));*/ + api.registerEffectComponent(EnchantibilityAuraMending.RES, TickEvent.PlayerTickEvent.class, EnchantibilityAuraMending::onPlayerTick, e -> Collections.singletonList(e.player)); } @Override